Qt UI:

* improvements for Mac OS X: change program icon in dock when there are new unread personal messages. * add big icons: eiskaltdcpp logo + envelope
ekzobrain · Jul 12, 2013 · 4610a35 · 4610a35
1 parent 42e7f76
commit 4610a35
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 7 deletions.
diff --git a/eiskaltdcpp-qt/icons/appl/default/icon_msg_big.png b/eiskaltdcpp-qt/icons/appl/default/icon_msg_big.png
diff --git a/eiskaltdcpp-qt/icons/appl/faenza/icon_msg_big.png b/eiskaltdcpp-qt/icons/appl/faenza/icon_msg_big.png
diff --git a/eiskaltdcpp-qt/icons/appl/monochrome/icon_msg_big.png b/eiskaltdcpp-qt/icons/appl/monochrome/icon_msg_big.png
diff --git a/eiskaltdcpp-qt/src/MainWindow.cpp b/eiskaltdcpp-qt/src/MainWindow.cpp
@@ -1896,9 +1896,9 @@ void MainWindow::redrawToolPanel(){
 #else // !defined(Q_WS_MAC)
  // Change program icon in dock when there are new unread personal messages.
  if (has_unread)
- this->setWindowIcon(WICON(WulforUtil::eiMESSAGE_TRAY_ICON));
+ qApp->setWindowIcon(WICON(WulforUtil::eiMESSAGE_TRAY_ICON));
  else
- this->setWindowIcon(WICON(WulforUtil::eiICON_APPL));
+ qApp->setWindowIcon(WICON(WulforUtil::eiICON_APPL));
 #endif // !defined(Q_WS_MAC)
 
  emit redrawWidgetPanels();

diff --git a/eiskaltdcpp-qt/src/Notification.cpp b/eiskaltdcpp-qt/src/Notification.cpp
@@ -174,10 +174,8 @@ void Notification::showMessage(int t, const QString &title, const QString &msg){
  break;
 
 #if defined(Q_WS_MAC)
- MainWindow::getInstance()->setWindowIcon(WICON(WulforUtil::eiMESSAGE_TRAY_ICON));
-
- if (MainWindow::getInstance()->isVisible())
- QApplication::alert(MainWindow::getInstance(), 0);
+ qApp->setWindowIcon(WICON(WulforUtil::eiMESSAGE_TRAY_ICON));
+ qApp->alert(MainWindow::getInstance(), 0);
 #else // defined(Q_WS_MAC)
  if (tray && t == PM && (!MainWindow::getInstance()->isVisible() || WBGET(WB_NOTIFY_CH_ICON_ALWAYS))){
  tray->setIcon(WICON(WulforUtil::eiMESSAGE_TRAY_ICON));

diff --git a/eiskaltdcpp-qt/src/WulforUtil.cpp b/eiskaltdcpp-qt/src/WulforUtil.cpp
@@ -359,7 +359,7 @@ bool WulforUtil::loadIcons(){
  m_PixmapMap[eiHUBMSG] = FROMTHEME("hubmsg", resourceFound);
  m_PixmapMap[eiICON_APPL] = FROMTHEME_SIDE("icon_appl_big", resourceFound, 128);
  m_PixmapMap[eiMESSAGE] = FROMTHEME("message", resourceFound);
- m_PixmapMap[eiMESSAGE_TRAY_ICON] = FROMTHEME("icon_msg", resourceFound);
+ m_PixmapMap[eiMESSAGE_TRAY_ICON] = FROMTHEME("icon_msg_big", resourceFound);
  m_PixmapMap[eiOWN_FILELIST] = FROMTHEME("own_filelist", resourceFound);
  m_PixmapMap[eiOPENLIST] = FROMTHEME("openlist", resourceFound);
  m_PixmapMap[eiOPEN_LOG_FILE]= FROMTHEME("log_file", resourceFound);