Changeset 6037 for branches/qt-gui_qt4/src/dialogs/skinbrowser.cpp

Timestamp:

01/13/08 21:51:35 (10 months ago)

Author:

eugene

Message:

Removed checks in SkinBrowserDlg::slot_apply(). The overhead is small, but this way we won't skip any changed inside the same skin/icons/emoticons instance.

Files:

• branches/qt-gui_qt4/src/dialogs/skinbrowser.cpp (modified) (2 diffs)

branches/qt-gui_qt4/src/dialogs/skinbrowser.cpp

@@ -463 +463 @@
 }
 
-/*! \brief Applies Skin/iconset
- *
- *  slot_apply() applies all selected options that differ from the currently
- *  activated settings.
+/*! \brief Applies settings
+ *
+ *  Applies selected skin/icons/emoticons.
  */
 void SkinBrowserDlg::slot_apply()
@@ -472 +471 @@
   IconManager* iconManager = IconManager::instance();
 
-  if (cmbSkin->currentText() != Config::Skin::active()->skinName())
-    Config::Skin::active()->loadSkin(cmbSkin->currentText().toLocal8Bit());
-
-  if (cmbIcon->currentText() != iconManager->iconSet())
-    if (!iconManager->loadIcons(cmbIcon->currentText()))
-      WarnUser(this, tr("Unable to load icons \n%1.").arg(cmbIcon->currentText().toLocal8Bit().data()));
-
-  if (cmbExtIcon->currentText() != iconManager->extendedIconSet())
-    if (!iconManager->loadExtendedIcons(cmbExtIcon->currentText()))
-      WarnUser(this, tr("Unable to load extended icons \n%1.").arg(cmbExtIcon->currentText().toLocal8Bit().data()));
-
-  if (cmbEmoticon->currentText() != Emoticons::self()->theme())
-    Emoticons::self()->setTheme(cmbEmoticon->currentText());
+  Config::Skin::active()->loadSkin(cmbSkin->currentText().toLocal8Bit());
+
+  if (!iconManager->loadIcons(cmbIcon->currentText()))
+    WarnUser(this, tr("Unable to load icons\n%1.")
+        .arg(cmbIcon->currentText().toLocal8Bit().data()));
+
+  if (!iconManager->loadExtendedIcons(cmbExtIcon->currentText()))
+    WarnUser(this, tr("Unable to load extended icons\n%1.")
+        .arg(cmbExtIcon->currentText().toLocal8Bit().data()));
+
+  Emoticons::self()->setTheme(cmbEmoticon->currentText());
 }