Changeset 3cadf24d00 in tspsg for src/settingsdialog.cpp

Timestamp:

Jun 22, 2010, 3:38:24 PM (14 years ago)

Author:

Oleksii Serdiuk

Branches:

0.1.3.145-beta1-symbian, 0.1.4.170-beta2-bb10, appveyor, imgbot, master, readme

Children:

e9db3e216b

Parents:

bcd2a3b47a

git-author:

Oleksii Serdiuk <contacts@…> (06/22/10 15:38:24)

git-committer:

Oleksii Serdiuk <contacts@…> (06/29/12 19:41:43)

Message:

• TSPSG will now try to use your current icon theme in Linux if it follows freedesktop.org icon and naming spesifications: see ​http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html and ​http://standards.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html
• Translations are now bundled "inside" TSPSG (as resources). You can override a bundled translation by placing your version with the same name into the l10n folder.
• Some small MacOSX related fixes.

File:

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

src/settingsdialog.cpp

@@ -35 +35 @@
         setupUi(this);
 
-        buttonBox->button(QDialogButtonBox::Save)->setIcon(QIcon(":/images/icons/dialog-ok.png"));
-        buttonBox->button(QDialogButtonBox::Save)->setStatusTip(tr("Save new preferences"));
-        buttonBox->button(QDialogButtonBox::Save)->setCursor(QCursor(Qt::PointingHandCursor));
-        buttonBox->button(QDialogButtonBox::Cancel)->setIcon(QIcon(":/images/icons/dialog-cancel.png"));
+        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")));
+        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)->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")));
 
 QPalette p = bgWhite->palette();
@@ -108 +114 @@
         imgIcon->setSizePolicy(QSizePolicy::Fixed,QSizePolicy::Expanding);
         imgIcon->setFrameShape(QFrame::NoFrame);
-        imgIcon->setPixmap(QPixmap(":/images/icons/preferences-system.png"));
+        imgIcon->setPixmap(QIcon::fromTheme("preferences-system", QIcon(":/images/icons/preferences-system.png")).pixmap(128, 128));
         imgIcon->setStyleSheet("background-color: #0080C0; padding-top: 11px;");
         imgIcon->setAlignment(Qt::AlignTop | Qt::AlignHCenter);