rev 3236 - in kde-extras/rsibreak/trunk/debian: . patches

[Tom Albers]

Author: tomalbers-guest
Date: 2006-03-04 01:25:49 +0000 (Sat, 04 Mar 2006)
New Revision: 3236

Added:
   kde-extras/rsibreak/trunk/debian/patches/13_popup.diff
   kde-extras/rsibreak/trunk/debian/patches/14_double_quit.diff
Modified:
   kde-extras/rsibreak/trunk/debian/TODO
   kde-extras/rsibreak/trunk/debian/changelog
Log:
Added two bug fix patches, tested rsibreak under gnome and updated changelog


Modified: kde-extras/rsibreak/trunk/debian/TODO
===================================================================
--- kde-extras/rsibreak/trunk/debian/TODO	2006-03-03 01:19:40 UTC (rev 3235)
+++ kde-extras/rsibreak/trunk/debian/TODO	2006-03-04 01:25:49 UTC (rev 3236)
@@ -6,3 +6,11 @@
 	o about dialog text is not that long
 
 o Test in a gnome desktop
+  - 0.5.0 is tested:
+     - quit is double in context menu [fixed by a patch]
+     - It is started at login, regardless of the setting.
+       Gnome does not have a setting where you can set a condition to start / not
+       start, nor can you disable the startup for GNome when the desktop is in the
+       $prefix/autostart. So: known bug - unresolvable untill a fd.o spec is
+       there and implemented
+     - RSIBreak works nicely under Gnome, no other issues found.

Modified: kde-extras/rsibreak/trunk/debian/changelog
===================================================================
--- kde-extras/rsibreak/trunk/debian/changelog	2006-03-03 01:19:40 UTC (rev 3235)
+++ kde-extras/rsibreak/trunk/debian/changelog	2006-03-04 01:25:49 UTC (rev 3236)
@@ -1,3 +1,14 @@
+rsibreak (0.5.0-2) UNRELEASED; urgency=low
+
+  [ Tom Albers ]
+  * added 13_popup.diff: the popup states there is a clock in the tray,
+    but that only appears after clicking the message away, this fixes that.
+    Bug is there since Nov 12, 2005.
+  * added 14_double_quit.diff: for Gnome there were two Quit items in the 
+    context menu, this is now resolved.
+
+ -- Tom Albers <toma at kovoks.nl>  Sat,  4 Mar 2006 01:41:25 +0100
+
 rsibreak (0.5.0-1) unstable; urgency=low
 
   * "The too late for Dapper, but not for Etch" upload

Added: kde-extras/rsibreak/trunk/debian/patches/13_popup.diff
===================================================================
--- kde-extras/rsibreak/trunk/debian/patches/13_popup.diff	2006-03-03 01:19:40 UTC (rev 3235)
+++ kde-extras/rsibreak/trunk/debian/patches/13_popup.diff	2006-03-04 01:25:49 UTC (rev 3236)
@@ -0,0 +1,26 @@
+--- /rsibreak/src/rsiwidget.cpp  2006/03/02 08:35:05 514977
++++ /rsibreak/src/rsiwidget.cpp   2006/03/02 08:39:59 514978
+@@ -51,6 +51,12 @@
+ RSIWidget::RSIWidget( QWidget *parent, const char *name )
+     : QWidget( parent, name )
+ {
++
++    // Keep these 3 lines _above_ the messagebox, so the text actually is right.
++    m_tray = new RSIDock(this,"Tray Item");
++    m_tray->show();
++    m_tray->setPixmap( KSystemTray::loadIcon("rsibreak0") );
++    
+     if (KMessageBox::shouldBeShownContinue("dont_show_welcome_again_for_001"))
+     {
+         KMessageBox::information(parent,
+@@ -82,9 +88,6 @@
+     m_backgroundimage = new QPixmap(QApplication::desktop()->width(),
+                                     QApplication::desktop()->height());
+ 
+-    m_tray = new RSIDock(this,"Tray Item");
+-    m_tray->show();
+-
+     m_tooltip = new RSIToolTip( m_tray, "Tooltip" );
+     connect( m_tray, SIGNAL( showToolTip() ), m_tooltip, SLOT( show() ) );
+     connect( m_tray, SIGNAL( hideToolTip() ), m_tooltip, SLOT( hide() ) );
+

Added: kde-extras/rsibreak/trunk/debian/patches/14_double_quit.diff
===================================================================
--- kde-extras/rsibreak/trunk/debian/patches/14_double_quit.diff	2006-03-03 01:19:40 UTC (rev 3235)
+++ kde-extras/rsibreak/trunk/debian/patches/14_double_quit.diff	2006-03-04 01:25:49 UTC (rev 3236)
@@ -0,0 +1,48 @@
+--- rsibreak/src/rsidock.cpp	(revision 515513)
++++ rsibreak/src/rsidock.cpp	(revision 515514)
+@@ -35,7 +35,7 @@
+ 
+ RSIDock::RSIDock( QWidget *parent, const char *name )
+     : KSystemTray( parent, name ), m_suspended( false ), m_tooltiphidden( false )
+-    , m_tooltiptimer( 0 )
++    , m_hasQuit ( false ), m_tooltiptimer( 0 )
+ 
+ {
+ 
+@@ -142,11 +142,17 @@
+ {
+     kdDebug() << "Entering RSIDock::showEvent" << endl;
+ 
+-    contextMenu()->insertSeparator();
+-    KAction* action = actionCollection()->
+-            action(KStdAction::name(KStdAction::Quit));
+-    if (action)
+-        action->plug(contextMenu());
++    if (!m_hasQuit)
++    {
++        contextMenu()->insertSeparator();
++        
++        KAction* action = actionCollection()->
++                action(KStdAction::name(KStdAction::Quit));
++        if (action)
++            action->plug(contextMenu());
++        
++        m_hasQuit=true;
++    }
+ }
+ 
+ void RSIDock::mousePressEvent( QMouseEvent *e )
+--- rsibreak/src/rsidock.h	(revision 515513)
++++ rsibreak/src/rsidock.h	(revision 515514)
+@@ -142,6 +142,11 @@
+         int m_suspendItem;
+         bool m_suspended;
+         bool m_tooltiphidden;
++        
++        /** This bool is needed to determine if Quit is added to the context
++            menu. Although not needed for KDE, GNome will plug the Quit item
++            twice in the contextmenu. */
++        bool m_hasQuit;
+ 
+         QTimer *m_tooltiptimer;
+ };