Changeset 119 for smplayer/trunk/src/baseguiplus.cpp

Timestamp:

Dec 27, 2011, 5:44:12 PM (14 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: latest svn update

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/baseguiplus.cpp (modified) (12 diffs)

smplayer/trunk/src/baseguiplus.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2010 Ricardo Villalba <rvm@escomposlinux.org>
+    Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org>
 
     This program is free software; you can redistribute it and/or modify
@@ -81 +81 @@
         optionsMenu->addAction(showTrayAct);
 #else
-        trayAvailable();
-        connect( optionsMenu, SIGNAL(aboutToShow()),
+        trayAvailable();
+        connect( optionsMenu, SIGNAL(aboutToShow()),
              this, SLOT(trayAvailable()) );
 #endif
@@ -89 +89 @@
         connect( showAllAct, SIGNAL(triggered()),
              this, SLOT(toggleShowAll()) );
+
 
         context_menu = new QMenu(this);
@@ -113 +114 @@
         context_menu->addSeparator();
         context_menu->addAction(quitAct);
-
+        
         tray->setContextMenu( context_menu );
+
 #if DOCK_PLAYLIST
         // Playlistdock
@@ -172 +174 @@
 void BaseGuiPlus::closeWindow() {
         qDebug("BaseGuiPlus::closeWindow");
+
         if (tray->isVisible()) {
                 //e->ignore();
@@ -201 +204 @@
 
         quitAct->change( Images::icon("exit"), tr("&Quit") );
-
         showTrayAct->change( Images::icon("systray"), tr("S&how icon in system tray") );
+
         updateShowAllAct();
 
@@ -253 +256 @@
 
         bool show_tray_icon = set->value( "show_tray_icon", false).toBool();
-
         showTrayAct->setChecked( show_tray_icon );
         //tray->setVisible( show_tray_icon );
+
         mainwindow_visible = set->value("mainwindow_visible", true).toBool();
 
@@ -277 +280 @@
         updateShowAllAct();
 }
+
 
 void BaseGuiPlus::trayIconActivated(QSystemTrayIcon::ActivationReason reason) {
@@ -354 +358 @@
 void BaseGuiPlus::resizeWindow(int w, int h) {
     qDebug("BaseGuiPlus::resizeWindow: %d, %d", w, h);
+
         if ( (tray->isVisible()) && (!isVisible()) ) showAll(true);
+
         BaseGui::resizeWindow(w, h );
 }
@@ -361 +367 @@
     qDebug("BaseGuiPlus::updateMediaInfo");
         BaseGui::updateMediaInfo();
+
         tray->setToolTip( windowTitle() );
 }
@@ -366 +373 @@
 void BaseGuiPlus::setWindowCaption(const QString & title) {
         tray->setToolTip( title );
+
         BaseGui::setWindowCaption( title );
 }
@@ -605 +613 @@
         return volumeslider_action;
 }
+
 #ifdef Q_OS_OS2
 // we test if xcenter is available at all. if not disable the tray action. this is possible when xcenter is not opened or crashed
-void BaseGuiPlus::trayAvailable()
-{
-        if (!tray->isSystemTrayAvailable()) {
-           optionsMenu->removeAction(showTrayAct);
-        }
-        else {
-           optionsMenu->addAction(showTrayAct);
-        }
-}
-#endif
+void BaseGuiPlus::trayAvailable() {
+        if (!tray->isSystemTrayAvailable()) {
+                        optionsMenu->removeAction(showTrayAct);
+        }
+        else {
+                optionsMenu->addAction(showTrayAct);
+        }
+}
+#endif
+
 #include "moc_baseguiplus.cpp"