[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/network/kmldonkey/kmldonkey
From:       Sebastian Sauer <mail () dipe ! org>
Date:       2008-03-31 22:56:48
Message-ID: 1207004208.137694.9233.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 792385 by sebsauer:

use passiv popups

 M  +16 -20    kmldonkey.cpp  
 M  +4 -4      kmldonkey.notifyrc  


--- trunk/extragear/network/kmldonkey/kmldonkey/kmldonkey.cpp #792384:792385
@@ -520,7 +520,7 @@
     int currentPage = stategroup.readEntry("CurrentPage", index.isValid() ? \
index.row() : -1);  
     KConfigGroup optionsgroup = conf->group("Options");
-    m_toolbarAction->setChecked( optionsgroup.readEntry("ShowToolbar", true) );
+    m_toolbarAction->setChecked( optionsgroup.readEntry("ShowToolbar", false) );
     emit optionsShowToolbar();
     m_statusbarAction->setChecked( optionsgroup.readEntry("ShowStatusbar", true) );
     emit optionsShowStatusbar();
@@ -975,10 +975,8 @@
 
 void KMLDonkey::coreDisconnected(int err)
 {
-    const QString s = i18n("Disconnected.");
-    tray->tooltip = s;
-    changeStatusbar(s);
-    QString statInfoTooltip = QString::null;
+    tray->tooltip = i18n("<b>Disconnected.</b>");
+    QString statInfoTooltip;
 
     statServer->setText(QString::null);
     statFiles->setText(QString::null);
@@ -989,15 +987,15 @@
     switch (err) {
     case ProtocolInterface::AuthenticationError:
         statInfoTooltip = i18n("Authentication error. Incorrect name or password.");
-        KMessageBox::error(this, statInfoTooltip);
+        //KMessageBox::error(this, statInfoTooltip);
         reconnect = 0;
         break;
     case ProtocolInterface::ConnectionRefusedError:
         if (!reconnect) {
             statInfoTooltip = i18n("Connection to the core was refused. "
                                    "Are you sure it is running?");
-            if(isVisible())
-                KMessageBox::error(this, statInfoTooltip);
+            //if(isVisible())
+            //    KMessageBox::error(this, statInfoTooltip);
             reconnect = 0;
         }
         else
@@ -1007,8 +1005,8 @@
         HostInterface* host = hostManager->hostProperties(lastHost);
         if (!reconnect) {
             statInfoTooltip = host ? i18n("Host '%1' not found!", host->address()) : \
                i18n("No Host defined!");
-            if (isVisible())
-                KMessageBox::error(this, statInfoTooltip);
+            //if (isVisible())
+            //    KMessageBox::error(this, statInfoTooltip);
             reconnect = 0;
         }
         else
@@ -1018,8 +1016,8 @@
         if (!reconnect) {
             statInfoTooltip = i18n("A read error occurred when communicating "
                                    "with the core. The connection has been \
                terminated.");
-            if (isVisible())
-                KMessageBox::error(this, statInfoTooltip);
+            //if (isVisible())
+            //    KMessageBox::error(this, statInfoTooltip);
             reconnect = 0;
         }
         else
@@ -1028,8 +1026,8 @@
     case ProtocolInterface::IncompatibleProtocolError:
         statInfoTooltip = i18n("Your mldonkey core uses an obsolete communications \
                protocol. "
                                "Please upgrade it to a more recent version!");
-        if (isVisible())
-            KMessageBox::error(this, statInfoTooltip);
+        //if (isVisible())
+        //    KMessageBox::error(this, statInfoTooltip);
         reconnect = 0;
         break;
     default:
@@ -1037,12 +1035,10 @@
         break;
     }
 
-    if (statInfoTooltip.isEmpty())
-        KNotification::event(QString::fromLatin1("KMLDonkeyDisconnected"),  \
                tray->tooltip, QPixmap(), this);
-    else {
-        QToolTip::add(statInfo, statInfoTooltip);
-        KNotification::event(QString::fromLatin1("KMLDonkeyDisconnected"), \
                tray->tooltip + " " + statInfoTooltip, QPixmap(), this);
-    }
+    const QString status = statInfoTooltip.isEmpty() ? tray->tooltip : QString("%1 \
%2").arg(tray->tooltip).arg(statInfoTooltip); +    changeStatusbar(status);
+    QToolTip::add(statInfo, status);
+    KNotification::event(QString::fromLatin1("KMLDonkeyDisconnected"), status, \
QPixmap(), this);  
     Q3PtrListIterator<KMLDonkeyPage> it(pages);
     for ( ; it.current() ; ++it ) (*it)->clear();
--- trunk/extragear/network/kmldonkey/kmldonkey/kmldonkey.notifyrc #792384:792385
@@ -10,7 +10,7 @@
 Comment[sv]=Kmldonkey
 Comment[ta]=கேஎம்எல்டாங்கி
 Comment[xx]=xxKMLDonkeyxx
-Version=4
+Version=5
 
 [Event/KMLDonkeyConnected]
 Name=Connected
@@ -83,7 +83,7 @@
 Comment[uk]=З'єднано з основою
 Comment[xx]=xxConnected to corexx
 Comment[zh_TW]=已連線到� �心
-Action=None
+Action=Popup
 
 [Event/KMLDonkeyDisconnected]
 Name=Disconnected
@@ -156,7 +156,7 @@
 Comment[uk]=Від'єднано від основи
 Comment[xx]=xxDisconnected from corexx
 Comment[zh_TW]=已從� �心離線
-Action=Taskbar
+Action=Popup
 
 [Event/KMLDonkeyDownloadFinished]
 Name=Download completed
@@ -227,7 +227,7 @@
 Comment[uk]=Звантаження файла завершене
 Comment[xx]=xxFile download has been completedxx
 Comment[zh_TW]=檔案下載已完成
-Action=Taskbar
+Action=Popup
 
 [Event/KMLDonkeyDownloadAdded]
 Name=Download added


[prev in list] [next in list] [prev in thread] [next in thread]