Changeset 127 for smplayer/vendor/current/src/prefinterface.cpp

Timestamp:

Mar 29, 2012, 3:09:42 PM (13 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: update to latest svn

File:

• smplayer/vendor/current/src/prefinterface.cpp (modified) (12 diffs)

smplayer/vendor/current/src/prefinterface.cpp

@@ -67 +67 @@
         }
 
+#ifdef SINGLE_INSTANCE
         connect(single_instance_check, SIGNAL(toggled(bool)), 
             this, SLOT(changeInstanceImages()));
+#else
+        tabWidget->setTabEnabled(SINGLE_INSTANCE_TAB, false);
+#endif
 
 #ifdef Q_OS_WIN
@@ -121 +125 @@
         /* volume_icon->setPixmap( Images::icon("speaker") ); */
 
+#ifdef SINGLE_INSTANCE
         changeInstanceImages();
+#endif
 
         // Seek widgets
@@ -171 +177 @@
         setResizeMethod( pref->resize_method );
         setSaveSize( pref->save_window_size_on_exit );
+#ifdef SINGLE_INSTANCE
         setUseSingleInstance(pref->use_single_instance);
-        setServerPort(pref->connection_port);
-        setUseAutoPort(pref->use_autoport);
+#endif
         setRecentsMaxItems(pref->history_recents->maxItems());
 
@@ -208 +214 @@
         language_changed = false;
         iconset_changed = false;
+        gui_changed = false;
+        style_changed = false;
         recents_changed = false;
-        port_changed = false;
-        style_changed = false;
 
         if (pref->language != language()) {
@@ -223 +229 @@
         }
 
+        if (pref->gui != GUI()) {
+                pref->gui = GUI();
+                gui_changed = true;
+        }
+
         pref->resize_method = resizeMethod();
         pref->save_window_size_on_exit = saveSize();
 
+#ifdef SINGLE_INSTANCE
         pref->use_single_instance = useSingleInstance();
-        if (pref->connection_port != serverPort()) {
-                pref->connection_port = serverPort();
-                port_changed = true;
-        }
-
-        if (pref->use_autoport != useAutoPort()) {
-                pref->use_autoport = useAutoPort();
-                port_changed = true;
-        }
+#endif
 
         if (pref->history_recents->maxItems() != recentsMaxItems()) {
@@ -261 +265 @@
         }
 #endif
-
-        pref->gui = GUI();
 
         pref->floating_control_animated = floatingAnimated();
@@ -348 +350 @@
 }
 
+#ifdef SINGLE_INSTANCE
 void PrefInterface::setUseSingleInstance(bool b) {
         single_instance_check->setChecked(b);
@@ -356 +359 @@
         return single_instance_check->isChecked();
 }
-
-void PrefInterface::setServerPort(int port) {
-        server_port_spin->setValue(port);
-}
-
-int PrefInterface::serverPort() {
-        return server_port_spin->value();
-}
-
-void PrefInterface::setUseAutoPort(bool b) {
-        automatic_port_button->setChecked(b);
-        manual_port_button->setChecked(!b);
-}
-
-bool PrefInterface::useAutoPort() {
-        return automatic_port_button->isChecked();
-}
-
-void PrefInterface::setSingleInstanceTabEnabled(bool b) {
-        tabWidget->setTabEnabled(SINGLE_INSTANCE_TAB, b);
-}
-
-bool PrefInterface::singleInstanceTabEnabled() {
-        return tabWidget->isTabEnabled(SINGLE_INSTANCE_TAB);
-}
+#endif
 
 void PrefInterface::setRecentsMaxItems(int n) {
@@ -473 +452 @@
 }
 
+#ifdef SINGLE_INSTANCE
 void PrefInterface::changeInstanceImages() {
         if (single_instance_check->isChecked())
@@ -479 +459 @@
                 instances_icon->setPixmap( Images::icon("instance2") );
 }
+#endif
 
 void PrefInterface::setHideVideoOnAudioFiles(bool b) {
@@ -605 +586 @@
                 tr("Note: this option only works with MPlayer2") );
 
+#ifdef SINGLE_INSTANCE
         addSectionTitle(tr("Instances"));
 
@@ -611 +593 @@
         tr("Check this option if you want to use an already running instance "
            "of SMPlayer when opening other files.") );
-
-        setWhatsThis(automatic_port_button, tr("Automatic port"),
-        tr("SMPlayer needs to listen to a port to receive commands from other "
-           "instances. If you select this option, a port will be "
-           "automatically chosen.") );
-
-        setWhatsThis(server_port_spin, tr("Manual port"),
-        tr("SMPlayer needs to listen to a port to receive commands from other "
-           "instances. You can change the port in case the default one is "
-           "used by another application.") );
-
-        manual_port_button->setWhatsThis( server_port_spin->whatsThis() );
+#endif
 
         addSectionTitle(tr("Floating control"));