From ae53e8e3ef24525055889779bf273738183516c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20K=C3=B6gl?= Date: Tue, 15 Apr 2014 18:08:00 +0200 Subject: [PATCH] implemented real model/view interface --- texter/texter/build.sh | 4 +- texter/texter/main.py | 114 ++++++++++++++++------------- texter/texter/text_sorter.ui | 85 +++++++++++++++++---- texter/texter/text_sorter_ui.py | 61 ++++++++++------ texter/texter/texter4.ui | 126 ++++++++++++++++++++++++++++++++ texter/texter/texter_ui.py | 4 +- 6 files changed, 302 insertions(+), 92 deletions(-) create mode 100644 texter/texter/texter4.ui diff --git a/texter/texter/build.sh b/texter/texter/build.sh index 6e82d76..2239a83 100644 --- a/texter/texter/build.sh +++ b/texter/texter/build.sh @@ -1,2 +1,2 @@ -pykdeuic4-python2.7 -o texter_ui.py texter3.ui -pykdeuic4-python2.7 -o text_sorter_ui.py text_sorter.ui +# pykdeuic4-python2.7 -o texter_ui.py texter3.ui +pykdeuic4-python2.7 -o text_sorter_ui.py texter4.ui diff --git a/texter/texter/main.py b/texter/texter/main.py index 19e7478..c24ed78 100644 --- a/texter/texter/main.py +++ b/texter/texter/main.py @@ -12,10 +12,11 @@ from operator import itemgetter from PyQt4 import QtCore, QtGui from PyKDE4.kdecore import ki18n, KCmdLineArgs, KAboutData -from PyKDE4.kdeui import KActionCollection, KRichTextWidget, KComboBox, KPushButton, KRichTextWidget, KMainWindow, KToolBar, KApplication, KAction, KToolBarSpacerAction, KSelectAction, KToggleAction, KShortcut +from PyKDE4.kdeui import KDialog, KActionCollection, KRichTextWidget, KComboBox, KPushButton, KRichTextWidget, KMainWindow, KToolBar, KApplication, KAction, KToolBarSpacerAction, KSelectAction, KToggleAction, KShortcut from texter_ui import Ui_MainWindow, _fromUtf8 -from text_sorter_ui import Ui_text_sorter_dialog +from text_sorter_ui import Ui_TextSorterDialog +from text_model import TextModel appName = "texter" catalog = "448texter" @@ -36,21 +37,24 @@ for path in QtGui.QIcon.themeSearchPaths(): # in your local icon directory: # ln -s /your/icon/theme/directory $HOME/.icons/hicolor -class TextSorterDialog(QtGui.QDialog, Ui_text_sorter_dialog): +class TextSorterDialog(QtGui.QWidget, Ui_TextSorterDialog): def __init__(self, parent = None): super(TextSorterDialog, self).__init__(parent) - # setup the ui + ## setup the ui self.setupUi(self) - self.setModal(False) + #self.setModal(False) self.fill_list() - self.text_list.listView().clicked.connect(self.slot_show_text) - self.accepted.connect(self.slot_saveToDb) + self.text_list.clicked.connect(self.slot_show_text) + #self.accepted.connect(self.slot_saveToDb) + self.remove_button.clicked.connect(self.slot_removeItem) def fill_list(self): - for preview, text in self.parent().text_db: - self.text_list.insertItem(preview) + self.model = self.parent().parent().model + self.text_list.setModel(self.model) + #for preview, text in self.parent().text_db: + #self.text_list.insertItem(preview) def slot_text_up(self): pass @@ -59,21 +63,19 @@ class TextSorterDialog(QtGui.QDialog, Ui_text_sorter_dialog): pass def slot_show_text(self, model_index): - self.text_preview.setTextOrHtml(self.parent().text_db[model_index.row()][1]) + self.text_preview.setTextOrHtml(self.parent().parent().model.text_db[model_index.row()][1]) def slot_saveToDb(self): data = list() - self.parent().text_combo.clear() - parent = self.parent() - for preview in self.text_list.items(): - pre, text = parent.text_by_preview(preview) - data.append((preview, text)) - parent.text_combo.addAction(preview) - parent.text_combo.setCurrentItem(0) - parent.text_db = data - parent.slot_load_preview_text(0) - parent.slot_set_live_defaults() - parent.slot_set_preview_defaults() + pass + + + def slot_removeItem(self): + index = self.text_list.currentIndex().row() + print "remote index", index + self.model.removeRows(index, 1) + + class MainWindow(KMainWindow, Ui_MainWindow): @@ -94,7 +96,8 @@ class MainWindow(KMainWindow, Ui_MainWindow): self.preview_actions = list() self.live_actions = list() self.current = 0 - self.text_db = list() + self.model = TextModel(self) + self.is_auto_publish = False self.setupUi(self) @@ -107,8 +110,10 @@ class MainWindow(KMainWindow, Ui_MainWindow): self.toolbar.setMovable(False) self.toolbar.setFloatable(False) self.addToolBar(QtCore.Qt.BottomToolBarArea, self.toolbar) + self.createLiveActions() self.createPreviewActions() + self.slot_load() self.preview_text.document().setDefaultFont(self.font) @@ -144,7 +149,7 @@ class MainWindow(KMainWindow, Ui_MainWindow): self.streaming_action.triggered.connect(self.slot_toggle_streaming) self.auto_publish_action.toggled.connect(self.slot_auto_publish) - self.slot_load() + self.next_action.triggered.connect(self.slot_next_item) self.previous_action.triggered.connect(self.slot_previous_item) @@ -363,14 +368,7 @@ class MainWindow(KMainWindow, Ui_MainWindow): def get_preview_text(self, text): - return re.sub(" +", " ", text.replace("\n", " "))[:20] - - - def text_by_preview(self, preview): - for title, text in self.text_db: - if title == preview: - return title, text - return None + return re.sub(" +", " ", text.replace("\n", " ")).strip()[:20] def title_by_index(self, ix): @@ -381,13 +379,13 @@ class MainWindow(KMainWindow, Ui_MainWindow): def slot_next_item(self): - self.current = (self.text_combo.currentItem() + 1) % len(self.text_db) + self.current = (self.text_combo.currentItem() + 1) % len(self.model.text_db) self.text_combo.setCurrentItem(self.current) self.slot_load_preview_text(self.current) def slot_previous_item(self): - self.current = (self.text_combo.currentItem() - 1) % len(self.text_db) + self.current = (self.text_combo.currentItem() - 1) % len(self.model.text_db) self.text_combo.setCurrentItem(self.current) self.slot_load_preview_text(self.current) @@ -447,6 +445,15 @@ class MainWindow(KMainWindow, Ui_MainWindow): self.preview_text.clear() self.slot_set_preview_defaults() + def fill_combo_box(self): + print "fill_combo_box" + self.text_combo.clear() + for preview, text in self.model.text_db: + self.text_combo.addAction(preview) + + self.text_combo.setCurrentItem(0) + self.slot_load_preview_text(0) + def slot_removeItem(self): text = self.edit_item_selection.currentText() @@ -461,8 +468,12 @@ class MainWindow(KMainWindow, Ui_MainWindow): self.item_title.clear() self.item_position_input.setValue(0) + def slot_load_preview_text(self, index): - preview, text = self.text_db[index] + try: + preview, text = self.model.text_db[index] + except IndexError: + return self.preview_text.setTextOrHtml(text) if self.is_auto_publish: self.live_text.setTextOrHtml(text) @@ -473,19 +484,20 @@ class MainWindow(KMainWindow, Ui_MainWindow): preview = self.get_preview_text(unicode(self.live_text.toPlainText())) if not preview: return - old_item = self.text_by_preview(preview) + old_item = self.model.text_by_preview(preview) if old_item is not None: suffix = 1 while 1: tmp_preview = "%s_%d" % (preview, suffix) - tmp = self.text_by_preview(tmp_preview) + tmp = self.model.text_by_preview(tmp_preview) if tmp is None: preview = tmp_preview break else: suffix += 1 - self.text_db.append((preview, text)) + self.model.text_db.append([preview, text]) + self.model.modelReset.emit() action = self.text_combo.addAction(preview) self.text_combo.setCurrentAction(action) @@ -495,7 +507,7 @@ class MainWindow(KMainWindow, Ui_MainWindow): if not preview: return - old_item = self.text_by_preview(preview) + old_item = self.model.text_by_preview(preview) if old_item is not None: suffix = 1 while 1: @@ -507,9 +519,10 @@ class MainWindow(KMainWindow, Ui_MainWindow): else: suffix += 1 - self.text_db.append((preview, text)) - action = self.text_combo.addAction(preview) - self.text_combo.setCurrentAction(action) + self.model.text_db.append([preview, text]) + self.model.modelReset.emit() + #action = self.text_combo.addAction(preview) + #self.text_combo.setCurrentAction(action) def slot_save(self): path = os.path.expanduser("~/.texter") @@ -520,7 +533,7 @@ class MainWindow(KMainWindow, Ui_MainWindow): except IOError: return else: - cPickle.dump(self.text_db, f, cPickle.HIGHEST_PROTOCOL) + cPickle.dump(self.model.text_db, f, cPickle.HIGHEST_PROTOCOL) def slot_valign(self): fn = QtGui.QFontMetrics(self.font) @@ -533,8 +546,12 @@ class MainWindow(KMainWindow, Ui_MainWindow): self.statusBar().showMessage("text lines = %d, line height = %d, max lines = %d" % (lines, h, max_lines)) def slot_open_dialog(self): - self.dialog = TextSorterDialog(self) - self.dialog.open() + self.dialog = KDialog(self) + self.dialog_widget = TextSorterDialog(self.dialog) + self.dialog.setMainWidget(self.dialog_widget) + self.dialog.move(800, 0) + self.dialog.exec_() + self.fill_combo_box() def slot_load(self): path = os.path.expanduser("~/.texter") @@ -546,17 +563,14 @@ class MainWindow(KMainWindow, Ui_MainWindow): return try: - self.text_db = cPickle.load(f) + self.model.text_db = [list(i) for i in cPickle.load(f)] except Exception, e: print e - data = list() - for title, text in self.text_db: - data.append((title, text)) - self.text_combo.addAction(title) - + self.fill_combo_box() self.text_combo.setCurrentItem(0) self.slot_load_preview_text(0) + self.slot_load_preview_text(0) def main(): diff --git a/texter/texter/text_sorter.ui b/texter/texter/text_sorter.ui index 02e6b16..e5c8389 100644 --- a/texter/texter/text_sorter.ui +++ b/texter/texter/text_sorter.ui @@ -2,25 +2,71 @@ text_sorter_dialog - - - 0 - 0 - 612 - 280 - + + + 0 + 0 + Dialog - + - - - KEditListWidget::Remove|KEditListWidget::UpDown + + + + 0 + 576 + + + + 16777215 + 576 + + + + + + + + + + + Remove + + + + + + + + + + + + + 2 + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + @@ -42,15 +88,26 @@ - KEditListWidget - QWidget -
keditlistwidget.h
+ KArrowButton + QPushButton +
karrowbutton.h
 KRichTextEdit KTextEdit
krichtextedit.h
 + + KButtonGroup + QGroupBox +
kbuttongroup.h
+ 1 + + + KPushButton + QPushButton +
kpushbutton.h
+ KTextEdit QTextEdit diff --git a/texter/texter/text_sorter_ui.py b/texter/texter/text_sorter_ui.py index 12029ec..3e67e8e 100644 --- a/texter/texter/text_sorter_ui.py +++ b/texter/texter/text_sorter_ui.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # coding=UTF-8 # -# Generated by pykdeuic4 from text_sorter.ui on Mon Apr 14 08:37:13 2014 +# Generated by pykdeuic4 from texter4.ui on Tue Apr 15 17:09:47 2014 # # WARNING! All changes to this file will be lost. from PyKDE4 import kdecore @@ -22,34 +22,47 @@ except AttributeError: def _translate(context, text, disambig): return QtGui.QApplication.translate(context, text, disambig) -class Ui_text_sorter_dialog(object): - def setupUi(self, text_sorter_dialog): - text_sorter_dialog.setObjectName(_fromUtf8("text_sorter_dialog")) - text_sorter_dialog.resize(612, 280) - self.verticalLayout = QtGui.QVBoxLayout(text_sorter_dialog) - self.verticalLayout.setObjectName(_fromUtf8("verticalLayout")) - self.horizontalLayout = QtGui.QHBoxLayout() +class Ui_TextSorterDialog(object): + def setupUi(self, TextSorterDialog): + TextSorterDialog.setObjectName(_fromUtf8("TextSorterDialog")) + TextSorterDialog.resize(588, 584) + self.horizontalLayout = QtGui.QHBoxLayout(TextSorterDialog) self.horizontalLayout.setObjectName(_fromUtf8("horizontalLayout")) - self.text_list = KEditListWidget(text_sorter_dialog) - self.text_list.setButtons(KEditListWidget.Buttons(KEditListWidget.Remove|KEditListWidget.UpDown)) + self.text_list = QtGui.QListView(TextSorterDialog) + self.text_list.setMinimumSize(QtCore.QSize(0, 576)) + self.text_list.setMaximumSize(QtCore.QSize(16777215, 576)) self.text_list.setObjectName(_fromUtf8("text_list")) self.horizontalLayout.addWidget(self.text_list) - self.text_preview = KRichTextWidget(text_sorter_dialog) + self.kbuttongroup = KButtonGroup(TextSorterDialog) + self.kbuttongroup.setObjectName(_fromUtf8("kbuttongroup")) + self.verticalLayout = QtGui.QVBoxLayout(self.kbuttongroup) + self.verticalLayout.setObjectName(_fromUtf8("verticalLayout")) + self.remove_button = KPushButton(self.kbuttongroup) + icon = QtGui.QIcon.fromTheme(_fromUtf8("edit-delete")) + self.remove_button.setIcon(icon) + self.remove_button.setObjectName(_fromUtf8("remove_button")) + self.verticalLayout.addWidget(self.remove_button) + self.move_up_button = KArrowButton(self.kbuttongroup) + self.move_up_button.setObjectName(_fromUtf8("move_up_button")) + self.verticalLayout.addWidget(self.move_up_button) + self.move_down_button = KArrowButton(self.kbuttongroup) + self.move_down_button.setProperty("arrowType", 2) + self.move_down_button.setObjectName(_fromUtf8("move_down_button")) + self.verticalLayout.addWidget(self.move_down_button) + spacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.verticalLayout.addItem(spacerItem) + self.horizontalLayout.addWidget(self.kbuttongroup) + self.text_preview = KRichTextWidget(TextSorterDialog) + self.text_preview.setMinimumSize(QtCore.QSize(0, 576)) + self.text_preview.setMaximumSize(QtCore.QSize(16777215, 576)) self.text_preview.setObjectName(_fromUtf8("text_preview")) self.horizontalLayout.addWidget(self.text_preview) - self.verticalLayout.addLayout(self.horizontalLayout) - self.buttonBox = QtGui.QDialogButtonBox(text_sorter_dialog) - self.buttonBox.setOrientation(QtCore.Qt.Horizontal) - self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Ok) - self.buttonBox.setObjectName(_fromUtf8("buttonBox")) - self.verticalLayout.addWidget(self.buttonBox) - self.retranslateUi(text_sorter_dialog) - QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(_fromUtf8("accepted()")), text_sorter_dialog.accept) - QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(_fromUtf8("rejected()")), text_sorter_dialog.reject) - QtCore.QMetaObject.connectSlotsByName(text_sorter_dialog) + self.retranslateUi(TextSorterDialog) + QtCore.QMetaObject.connectSlotsByName(TextSorterDialog) - def retranslateUi(self, text_sorter_dialog): - text_sorter_dialog.setWindowTitle(kdecore.i18n(_fromUtf8("Dialog"))) + def retranslateUi(self, TextSorterDialog): + TextSorterDialog.setWindowTitle(kdecore.i18n(_fromUtf8("Form"))) + self.remove_button.setText(kdecore.i18n(_fromUtf8("Remove"))) -from PyKDE4.kdeui import KEditListWidget, KRichTextWidget +from PyKDE4.kdeui import KButtonGroup, KArrowButton, KPushButton, KRichTextWidget diff --git a/texter/texter/texter4.ui b/texter/texter/texter4.ui new file mode 100644 index 0000000..a2b8a82 --- /dev/null +++ b/texter/texter/texter4.ui @@ -0,0 +1,126 @@ + + + TextSorterDialog + + + + 0 + 0 + 588 + 584 + + + + Form + + + + + + + 0 + 576 + + + + + 16777215 + 576 + + + + + + + + + + + Remove + + + + ../../../../../../../../ + + + + + + + + + + 2 + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + 0 + 576 + + + + + 16777215 + 576 + + + + + + + + + KArrowButton + QPushButton +
karrowbutton.h
+ + + KRichTextEdit + KTextEdit +
krichtextedit.h
+ + + KButtonGroup + QGroupBox +
kbuttongroup.h
+ 1 + + + KPushButton + QPushButton +
kpushbutton.h
+ + + KTextEdit + QTextEdit +
ktextedit.h
+ + + KRichTextWidget + KRichTextEdit +
krichtextwidget.h
+ + + + + diff --git a/texter/texter/texter_ui.py b/texter/texter/texter_ui.py index b4d1db0..b60c6a7 100644 --- a/texter/texter/texter_ui.py +++ b/texter/texter/texter_ui.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # coding=UTF-8 # -# Generated by pykdeuic4 from texter3.ui on Mon Apr 14 08:37:12 2014 +# Generated by pykdeuic4 from texter3.ui on Tue Apr 15 16:21:39 2014 # # WARNING! All changes to this file will be lost. from PyKDE4 import kdecore @@ -67,7 +67,7 @@ class Ui_MainWindow(object): self.live_text.setAutoFillBackground(False) self.live_text.setAcceptRichText(True) self.live_text.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByKeyboard|QtCore.Qt.LinksAccessibleByMouse|QtCore.Qt.TextBrowserInteraction|QtCore.Qt.TextEditable|QtCore.Qt.TextEditorInteraction|QtCore.Qt.TextSelectableByKeyboard|QtCore.Qt.TextSelectableByMouse) - self.live_text.setRichTextSupport(KRichTextWidget.RichTextSupportValues(KRichTextWidget.SupportAlignment|KRichTextWidget.SupportChangeListStyle|KRichTextWidget.SupportFontFamily|KRichTextWidget.SupportFontSize|KRichTextWidget.SupportIndentLists|KRichTextWidget.SupportTextForegroundColor)) + self.live_text.setRichTextSupport(KRichTextWidget.RichTextSupportValues(KRichTextWidget.SupportAlignment|KRichTextWidget.SupportChangeListStyle|KRichTextWidget.SupportFontFamily|KRichTextWidget.SupportFontSize|KRichTextWidget.SupportTextForegroundColor)) self.live_text.setObjectName(_fromUtf8("live_text")) self.horizontalLayout.addWidget(self.live_text) self.preview_text = KRichTextWidget(self.centralwidget)