Changeset 498:d94b9528d75b in qutecom-2.2

Timestamp:

Feb 21, 2010 3:16:24 PM (3 years ago)

Author:

laurent@…

Branch:

default

Message:

Unify title and toolbar on mac

Location:

wengophone/src/presentation/qt

Files:

• QtWengoPhone.cpp (modified) (1 diff)
• chat/QtChatLogViewer.cpp (modified) (2 diffs)
• chat/QtChatWindow.cpp (modified) (1 diff)

wengophone/src/presentation/qt/QtWengoPhone.cpp

@@ -202 +202 @@
 
         installQtBrowserWidget();
-
+        
+#if defined(OS_MACOSX)
+        _wengoPhoneWindow->setUnifiedTitleAndToolBarOnMac(true);
+#endif
+        
         Config & config = ConfigManager::getInstance().getCurrentConfig();
         mainWindowGeometry(config);

wengophone/src/presentation/qt/chat/QtChatLogViewer.cpp

@@ -151 +151 @@
         ////
         
+#if defined(OS_MACOSX)
+        setUnifiedTitleAndToolBarOnMac(true);
+#endif
+        
         SAFE_CONNECT(qtWengoPhone.getQtContactList(), SIGNAL(contactChangedEventSignal(QString )), SLOT(contactChangedEventSlot(QString)));
         
@@ -197 +201 @@
         copyQAction(toolBar, _ui->actionCreateConferenceCall);
         SAFE_CONNECT_RECEIVER(_ui->actionCreateConferenceCall, SIGNAL(triggered()), qtToolBar, SLOT(createConferenceCall()));
+
+#if defined (DISABLE_SMS)
+        _ui->actionSendSms->setVisible(false);
+#elif
         copyQAction(toolBar, _ui->actionSendSms);
         SAFE_CONNECT_RECEIVER(_ui->actionSendSms, SIGNAL(triggered()), qtToolBar, SLOT(sendSms()));
+#endif
+        
         SAFE_CONNECT(_ui->actionSaveHistoryAs, SIGNAL(triggered()), SLOT(saveChatHistory()));
         SAFE_CONNECT(_ui->actionActionRestartChat, SIGNAL(triggered()), SLOT(restartChat()));
         ////
 
-#ifndef DISABLE_FILETRANSFER
+#if defined (DISABLE_FILETRANSFER)
+        _ui->actionSendFile->setVisible(false);
+        _ui->actionShowFileTransfer->setVisible(false);
+#elif
         // setup "tools" menu
         copyQAction(toolBar, _ui->actionShowFileTransfer);

wengophone/src/presentation/qt/chat/QtChatWindow.cpp

@@ -166 +166 @@
         addChatWidgetTab(_imChatSession, from);
         ////
+                
+#if defined(OS_MACOSX)
+        setUnifiedTitleAndToolBarOnMac(true);
+#endif
 }