Changeset 134 in tspsg-svn for trunk/src/settingsdialog.cpp

Timestamp:

Sep 6, 2010, 10:23:38 PM (14 years ago)

Author:

laleppa

Message:

• The minimum required version of Qt is now 4.5.0.
• Updated source code to be compatible with the minimum required version of Qt.
• Updated documentation to reflect these changes.

File:

• trunk/src/settingsdialog.cpp (modified) (2 diffs)

trunk/src/settingsdialog.cpp

@@ -35 +35 @@
         setupUi(this);
 
-        setWindowIcon(QIcon::fromTheme("preferences-system", QIcon(":/images/icons/preferences-system.png")));
-
-        buttonBox->button(QDialogButtonBox::Ok)->setIcon(QIcon::fromTheme("dialog-ok", QIcon(":/images/icons/dialog-ok.png")));
+        setWindowIcon(GET_ICON("preferences-system"));
+
+        buttonBox->button(QDialogButtonBox::Ok)->setIcon(GET_ICON("dialog-ok"));
         buttonBox->button(QDialogButtonBox::Ok)->setStatusTip(tr("Save new preferences"));
         buttonBox->button(QDialogButtonBox::Ok)->setCursor(QCursor(Qt::PointingHandCursor));
-        buttonBox->button(QDialogButtonBox::Cancel)->setIcon(QIcon::fromTheme("dialog-cancel", QIcon(":/images/icons/dialog-cancel.png")));
+        buttonBox->button(QDialogButtonBox::Cancel)->setIcon(GET_ICON("dialog-cancel"));
         buttonBox->button(QDialogButtonBox::Cancel)->setStatusTip(tr("Close without saving preferences"));
         buttonBox->button(QDialogButtonBox::Cancel)->setCursor(QCursor(Qt::PointingHandCursor));
 
-        buttonColor->setIcon(QIcon::fromTheme("format-text-color", QIcon(":/images/icons/format-text-color.png")));
-        buttonFont->setIcon(QIcon::fromTheme("preferences-desktop-font", QIcon(":/images/icons/preferences-desktop-font.png")));
-        buttonHelp->setIcon(QIcon::fromTheme("help-hint", QIcon(":/images/icons/help-hint.png")));
+        buttonColor->setIcon(GET_ICON("format-text-color"));
+        buttonFont->setIcon(GET_ICON("preferences-desktop-font"));
+        buttonHelp->setIcon(GET_ICON("help-hint"));
 
 QPalette p = bgWhite->palette();
@@ -131 +131 @@
         imgIcon->setSizePolicy(QSizePolicy::Fixed,QSizePolicy::Expanding);
         imgIcon->setFrameShape(QFrame::NoFrame);
-        imgIcon->setPixmap(QIcon::fromTheme("preferences-system", QIcon(":/images/icons/preferences-system.png")).pixmap(128, 128));
+        imgIcon->setPixmap(GET_ICON("preferences-system").pixmap(128, 128));
         imgIcon->setStyleSheet("background-color: #0080C0; padding-top: 11px;");
         imgIcon->setAlignment(Qt::AlignTop | Qt::AlignHCenter);