diff options
Diffstat (limited to 'examples/widgets')
| -rw-r--r-- | examples/widgets/mainwindows/application/application.py | 18 | ||||
| -rw-r--r-- | examples/widgets/mainwindows/mdi/mdi.py | 18 | ||||
| -rw-r--r-- | examples/widgets/richtext/textedit/textedit.py | 41 |
3 files changed, 43 insertions, 34 deletions
diff --git a/examples/widgets/mainwindows/application/application.py b/examples/widgets/mainwindows/application/application.py index 7b2fa0672..f69eade2e 100644 --- a/examples/widgets/mainwindows/application/application.py +++ b/examples/widgets/mainwindows/application/application.py @@ -82,16 +82,16 @@ class MainWindow(QMainWindow): self.setWindowModified(self._text_edit.document().isModified()) def create_actions(self): - icon = QIcon.fromTheme("document-new", QIcon(':/images/new.png')) + icon = QIcon.fromTheme(QIcon.ThemeIcon.DocumentNew, QIcon(':/images/new.png')) self._new_act = QAction(icon, "&New", self, shortcut=QKeySequence.New, statusTip="Create a new file", triggered=self.new_file) - icon = QIcon.fromTheme("document-open", QIcon(':/images/open.png')) + icon = QIcon.fromTheme(QIcon.ThemeIcon.DocumentOpen, QIcon(':/images/open.png')) self._open_act = QAction(icon, "&Open...", self, shortcut=QKeySequence.Open, statusTip="Open an existing file", triggered=self.open) - icon = QIcon.fromTheme("document-save", QIcon(':/images/save.png')) + icon = QIcon.fromTheme(QIcon.ThemeIcon.DocumentSave, QIcon(':/images/save.png')) self._save_act = QAction(icon, "&Save", self, shortcut=QKeySequence.Save, statusTip="Save the document to disk", triggered=self.save) @@ -101,28 +101,30 @@ class MainWindow(QMainWindow): statusTip="Save the document under a new name", triggered=self.save_as) - self._exit_act = QAction("E&xit", self, shortcut="Ctrl+Q", + icon = QIcon.fromTheme(QIcon.ThemeIcon.ApplicationExit) + self._exit_act = QAction(icon, "E&xit", self, shortcut="Ctrl+Q", statusTip="Exit the application", triggered=self.close) - icon = QIcon.fromTheme("edit-cut", QIcon(':/images/cut.png')) + icon = QIcon.fromTheme(QIcon.ThemeIcon.EditCut, QIcon(':/images/cut.png')) self._cut_act = QAction(icon, "Cu&t", self, shortcut=QKeySequence.Cut, statusTip="Cut the current selection's contents to the clipboard", triggered=self._text_edit.cut) - icon = QIcon.fromTheme("edit-copy", QIcon(':/images/copy.png')) + icon = QIcon.fromTheme(QIcon.ThemeIcon.EditCopy, QIcon(':/images/copy.png')) self._copy_act = QAction(icon, "&Copy", self, shortcut=QKeySequence.Copy, statusTip="Copy the current selection's contents to the clipboard", triggered=self._text_edit.copy) - icon = QIcon.fromTheme("edit-paste", QIcon(':/images/paste.png')) + icon = QIcon.fromTheme(QIcon.ThemeIcon.EditPaste, QIcon(':/images/paste.png')) self._paste_act = QAction(icon, "&Paste", self, shortcut=QKeySequence.Paste, statusTip="Paste the clipboard's contents into the current " "selection", triggered=self._text_edit.paste) - self._about_act = QAction("&About", self, + icon = QIcon.fromTheme(QIcon.ThemeIcon.HelpAbout) + self._about_act = QAction(icon, "&About", self, statusTip="Show the application's About box", triggered=self.about) diff --git a/examples/widgets/mainwindows/mdi/mdi.py b/examples/widgets/mainwindows/mdi/mdi.py index 92c0c9c2b..c1fa01b8c 100644 --- a/examples/widgets/mainwindows/mdi/mdi.py +++ b/examples/widgets/mainwindows/mdi/mdi.py @@ -271,17 +271,17 @@ class MainWindow(QMainWindow): def create_actions(self): - icon = QIcon.fromTheme("document-new") + icon = QIcon.fromTheme(QIcon.ThemeIcon.DocumentNew) self._new_act = QAction(icon, "&New", self, shortcut=QKeySequence.New, statusTip="Create a new file", triggered=self.new_file) - icon = QIcon.fromTheme("document-open") + icon = QIcon.fromTheme(QIcon.ThemeIcon.DocumentOpen) self._open_act = QAction(icon, "&Open...", self, shortcut=QKeySequence.Open, statusTip="Open an existing file", triggered=self.open) - icon = QIcon.fromTheme("document-save") + icon = QIcon.fromTheme(QIcon.ThemeIcon.DocumentSave) self._save_act = QAction(icon, "&Save", self, shortcut=QKeySequence.Save, statusTip="Save the document to disk", triggered=self.save) @@ -291,23 +291,24 @@ class MainWindow(QMainWindow): statusTip="Save the document under a new name", triggered=self.save_as) - self._exit_act = QAction("E&xit", self, shortcut=QKeySequence.Quit, + icon = QIcon.fromTheme(QIcon.ThemeIcon.ApplicationExit) + self._exit_act = QAction(icon, "E&xit", self, shortcut=QKeySequence.Quit, statusTip="Exit the application", triggered=QApplication.instance().closeAllWindows) - icon = QIcon.fromTheme("edit-cut") + icon = QIcon.fromTheme(QIcon.ThemeIcon.EditCut) self._cut_act = QAction(icon, "Cu&t", self, shortcut=QKeySequence.Cut, statusTip="Cut the current selection's contents to the clipboard", triggered=self.cut) - icon = QIcon.fromTheme("edit-copy") + icon = QIcon.fromTheme(QIcon.ThemeIcon.EditCopy) self._copy_act = QAction(icon, "&Copy", self, shortcut=QKeySequence.Copy, statusTip="Copy the current selection's contents to the clipboard", triggered=self.copy) - icon = QIcon.fromTheme("edit-paste") + icon = QIcon.fromTheme(QIcon.ThemeIcon.EditPaste) self._paste_act = QAction(icon, "&Paste", self, shortcut=QKeySequence.Paste, statusTip="Paste the clipboard's contents into the current " @@ -341,7 +342,8 @@ class MainWindow(QMainWindow): self._separator_act = QAction(self) self._separator_act.setSeparator(True) - self._about_act = QAction("&About", self, + icon = QIcon.fromTheme(QIcon.ThemeIcon.HelpAbout) + self._about_act = QAction(icon, "&About", self, statusTip="Show the application's About box", triggered=self.about) diff --git a/examples/widgets/richtext/textedit/textedit.py b/examples/widgets/richtext/textedit/textedit.py index a3940ae0f..8019446f0 100644 --- a/examples/widgets/richtext/textedit/textedit.py +++ b/examples/widgets/richtext/textedit/textedit.py @@ -101,13 +101,14 @@ class TextEdit(QMainWindow): tb = self.addToolBar("File self.actions") menu = self.menuBar().addMenu("&File") - icon = QIcon.fromTheme("document-new", QIcon(RSRC_PATH + "/filenew.png")) + icon = QIcon.fromTheme(QIcon.ThemeIcon.DocumentNew, + QIcon(RSRC_PATH + "/filenew.png")) a = menu.addAction(icon, "&New", self.file_new) tb.addAction(a) a.setPriority(QAction.LowPriority) a.setShortcut(QKeySequence.New) - icon = QIcon.fromTheme("document-open", + icon = QIcon.fromTheme(QIcon.ThemeIcon.DocumentOpen, QIcon(RSRC_PATH + "/fileopen.png")) a = menu.addAction(icon, "&Open...", self.file_open) a.setShortcut(QKeySequence.Open) @@ -115,7 +116,7 @@ class TextEdit(QMainWindow): menu.addSeparator() - icon = QIcon.fromTheme("document-save", + icon = QIcon.fromTheme(QIcon.ThemeIcon.DocumentSave, QIcon(RSRC_PATH + "/filesave.png")) self._action_save = menu.addAction(icon, "&Save", self.file_save) self._action_save.setShortcut(QKeySequence.Save) @@ -126,7 +127,7 @@ class TextEdit(QMainWindow): a.setPriority(QAction.LowPriority) menu.addSeparator() - icon = QIcon.fromTheme("document-print", + icon = QIcon.fromTheme(QIcon.ThemeIcon.DocumentPrint, QIcon(RSRC_PATH + "/fileprint.png")) a = menu.addAction(icon, "&Print...", self.file_print) a.setPriority(QAction.LowPriority) @@ -151,32 +152,36 @@ class TextEdit(QMainWindow): tb = self.addToolBar("Edit self.actions") menu = self.menuBar().addMenu("&Edit") - icon = QIcon.fromTheme("edit-undo", + icon = QIcon.fromTheme(QIcon.ThemeIcon.EditUndo, QIcon(RSRC_PATH + "/editundo.png")) self._action_undo = menu.addAction(icon, "&Undo", self._text_edit.undo) self._action_undo.setShortcut(QKeySequence.Undo) tb.addAction(self._action_undo) - icon = QIcon.fromTheme("edit-redo", QIcon(RSRC_PATH + "/editredo.png")) + icon = QIcon.fromTheme(QIcon.ThemeIcon.EditRedo, + QIcon(RSRC_PATH + "/editredo.png")) self._action_redo = menu.addAction(icon, "&Redo", self._text_edit.redo) self._action_redo.setPriority(QAction.LowPriority) self._action_redo.setShortcut(QKeySequence.Redo) tb.addAction(self._action_redo) menu.addSeparator() - icon = QIcon.fromTheme("edit-cut", QIcon(RSRC_PATH + "/editcut.png")) + icon = QIcon.fromTheme(QIcon.ThemeIcon.EditCut, + QIcon(RSRC_PATH + "/editcut.png")) self._action_cut = menu.addAction(icon, "Cu&t", self._text_edit.cut) self._action_cut.setPriority(QAction.LowPriority) self._action_cut.setShortcut(QKeySequence.Cut) tb.addAction(self._action_cut) - icon = QIcon.fromTheme("edit-copy", QIcon(RSRC_PATH + "/editcopy.png")) + icon = QIcon.fromTheme(QIcon.ThemeIcon.EditCopy, + QIcon(RSRC_PATH + "/editcopy.png")) self._action_copy = menu.addAction(icon, "&Copy", self._text_edit.copy) self._action_copy.setPriority(QAction.LowPriority) self._action_copy.setShortcut(QKeySequence.Copy) tb.addAction(self._action_copy) - icon = QIcon.fromTheme("edit-paste", QIcon(RSRC_PATH + "/editpaste.png")) + icon = QIcon.fromTheme(QIcon.ThemeIcon.EditPaste, + QIcon(RSRC_PATH + "/editpaste.png")) self._action_paste = menu.addAction(icon, "&Paste", self._text_edit.paste) self._action_paste.setPriority(QAction.LowPriority) self._action_paste.setShortcut(QKeySequence.Paste) @@ -190,7 +195,7 @@ class TextEdit(QMainWindow): tb = self.addToolBar("Format self.actions") menu = self.menuBar().addMenu("F&ormat") - icon = QIcon.fromTheme("format-text-bold", + icon = QIcon.fromTheme(QIcon.ThemeIcon.FormatTextBold, QIcon(RSRC_PATH + "/textbold.png")) self._action_text_bold = menu.addAction(icon, "&Bold", self.text_bold) self._action_text_bold.setShortcut(Qt.CTRL | Qt.Key_B) @@ -201,7 +206,7 @@ class TextEdit(QMainWindow): tb.addAction(self._action_text_bold) self._action_text_bold.setCheckable(True) - icon = QIcon.fromTheme("format-text-italic", + icon = QIcon.fromTheme(QIcon.ThemeIcon.FormatTextItalic, QIcon(RSRC_PATH + "/textitalic.png")) self._action_text_italic = menu.addAction(icon, "&Italic", self.text_italic) self._action_text_italic.setPriority(QAction.LowPriority) @@ -212,7 +217,7 @@ class TextEdit(QMainWindow): tb.addAction(self._action_text_italic) self._action_text_italic.setCheckable(True) - icon = QIcon.fromTheme("format-text-underline", + icon = QIcon.fromTheme(QIcon.ThemeIcon.FormatTextUnderline, QIcon(RSRC_PATH + "/textunder.png")) self._action_text_underline = menu.addAction(icon, "&Underline", self.text_underline) @@ -226,36 +231,36 @@ class TextEdit(QMainWindow): menu.addSeparator() - icon = QIcon.fromTheme("format-justify-left", + icon = QIcon.fromTheme(QIcon.ThemeIcon.FormatJustifyLeft, QIcon(RSRC_PATH + "/textleft.png")) self._action_align_left = QAction(icon, "&Left", self) self._action_align_left.setShortcut(Qt.CTRL | Qt.Key_L) self._action_align_left.setCheckable(True) self._action_align_left.setPriority(QAction.LowPriority) - icon = QIcon.fromTheme("format-justify-center", + icon = QIcon.fromTheme(QIcon.ThemeIcon.FormatJustifyCenter, QIcon(RSRC_PATH + "/textcenter.png")) self._action_align_center = QAction(icon, "C&enter", self) self._action_align_center.setShortcut(Qt.CTRL | Qt.Key_E) self._action_align_center.setCheckable(True) self._action_align_center.setPriority(QAction.LowPriority) - icon = QIcon.fromTheme("format-justify-right", + icon = QIcon.fromTheme(QIcon.ThemeIcon.FormatJustifyRight, QIcon(RSRC_PATH + "/textright.png")) self._action_align_right = QAction(icon, "&Right", self) self._action_align_right.setShortcut(Qt.CTRL | Qt.Key_R) self._action_align_right.setCheckable(True) self._action_align_right.setPriority(QAction.LowPriority) - icon = QIcon.fromTheme("format-justify-fill", + icon = QIcon.fromTheme(QIcon.ThemeIcon.FormatJustifyFill, QIcon(RSRC_PATH + "/textjustify.png")) self._action_align_justify = QAction(icon, "&Justify", self) self._action_align_justify.setShortcut(Qt.CTRL | Qt.Key_J) self._action_align_justify.setCheckable(True) self._action_align_justify.setPriority(QAction.LowPriority) - icon = QIcon.fromTheme("format-indent-more", + icon = QIcon.fromTheme(QIcon.ThemeIcon.FormatIndentMore, QIcon(RSRC_PATH + "/format-indent-more.png")) self._action_indent_more = menu.addAction(icon, "&Indent", self.indent) self._action_indent_more.setShortcut(Qt.CTRL | Qt.Key_BracketRight) self._action_indent_more.setPriority(QAction.LowPriority) - icon = QIcon.fromTheme("format-indent-less", + icon = QIcon.fromTheme(QIcon.ThemeIcon.FormatIndentLess, QIcon(RSRC_PATH + "/format-indent-less.png")) self._action_indent_less = menu.addAction(icon, "&Unindent", self.unindent) |