[prev in list] [next in list] [prev in thread] [next in thread]
List: kopete-devel
Subject: Re: [kopete-devel] [PATCH] Fix the gadu plugin set description
From: Jakub Grandys <pennguin () gmail ! com>
Date: 2008-08-27 21:26:11
Message-ID: 200808272326.12109.pennguin () gmail ! com
[Download RAW message or body]
Tuesday 26 of August 2008 22:17:13 napisałeś(-łaś):
> Unfortunately I didn't have any other idea to fix this
I think this time I've found better solution ;) It also fixes crash when user
tries to set description when gadu account is offline, now it works well.
Moreover I also tried to get rid off old Qt3 classes in gaduaway.ui. So instead
of Q3ButtonGroup I've used QButtonGroup and set button's ids using
QButtonGroup capabilities. So please send any comments regarding this because
this is my first patch. Thanks
["gadugadu.description.v2.patch" (text/x-patch)]
Index: kopete/protocols/gadu/gaduaway.h
===================================================================
--- kopete/protocols/gadu/gaduaway.h (wersja 853278)
+++ kopete/protocols/gadu/gaduaway.h (kopia robocza)
@@ -25,6 +25,7 @@
#include <kdialog.h>
#include <qstring.h>
+#include <qbuttongroup.h>
class GaduAccount;
namespace Ui { class GaduAwayUI; }
@@ -45,6 +46,7 @@
private:
GaduAccount* account_;
Ui::GaduAwayUI* ui_;
+ QButtonGroup* statusGroup;
};
#endif
Index: kopete/protocols/gadu/gaduaway.cpp
===================================================================
--- kopete/protocols/gadu/gaduaway.cpp (wersja 853278)
+++ kopete/protocols/gadu/gaduaway.cpp (kopia robocza)
@@ -29,7 +29,7 @@
#include <ktextedit.h>
#include <klocale.h>
-#include <q3buttongroup.h>
+
#include <qradiobutton.h>
#include <qlineedit.h>
@@ -49,30 +49,37 @@
ui_->setupUi( w );
setMainWidget( w );
+ statusGroup = new QButtonGroup(w);
+ statusGroup->addButton(ui_->onlineButton_, GG_STATUS_AVAIL_DESCR);
+ statusGroup->addButton(ui_->awayButton_, GG_STATUS_BUSY_DESCR);
+ statusGroup->addButton(ui_->invisibleButton_, GG_STATUS_INVISIBLE_DESCR);
+ statusGroup->addButton(ui_->offlineButton_, GG_STATUS_NOT_AVAIL_DESCR);
+
ks = account->myself()->onlineStatus();
s = GaduProtocol::protocol()->statusToWithDescription( ks );
-
+
if ( s == GG_STATUS_NOT_AVAIL_DESCR ) {
- ui_->statusGroup_->find( GG_STATUS_NOT_AVAIL_DESCR )->setDisabled( true );
- ui_->statusGroup_->setButton( GG_STATUS_AVAIL_DESCR );
+ statusGroup->button(GG_STATUS_NOT_AVAIL_DESCR)->setDisabled(true);
+ statusGroup->button(GG_STATUS_AVAIL_DESCR)->setChecked(true);
}
else {
- ui_->statusGroup_->setButton( s );
+ statusGroup->button(s)->setChecked(true);
}
- ui_->textEdit_->setText( account->myself()->property( "awayMessage" ).value().toString() );
+ ui_->textEdit_->setText( account->myself()->property( "statusMessage" ).value().toString() );
connect( this, SIGNAL( applyClicked() ), SLOT( slotApply() ) );
}
GaduAway::~GaduAway()
{
+ delete statusGroup;
delete ui_;
}
int
GaduAway::status() const
{
- return ui_->statusGroup_->id( ui_->statusGroup_->selected() );
+ return statusGroup->checkedId();
}
QString
Index: kopete/protocols/gadu/ui/gaduawayui.ui
===================================================================
--- kopete/protocols/gadu/ui/gaduawayui.ui (wersja 853278)
+++ kopete/protocols/gadu/ui/gaduawayui.ui (kopia robocza)
@@ -6,7 +6,7 @@
<x>0</x>
<y>0</y>
<width>332</width>
- <height>188</height>
+ <height>204</height>
</rect>
</property>
<property name="focusPolicy" >
@@ -15,44 +15,11 @@
<property name="windowTitle" >
<string>Away Dialog</string>
</property>
- <layout class="QGridLayout" >
- <property name="leftMargin" >
- <number>0</number>
- </property>
- <property name="topMargin" >
- <number>0</number>
- </property>
- <property name="rightMargin" >
- <number>0</number>
- </property>
- <property name="bottomMargin" >
- <number>0</number>
- </property>
- <property name="horizontalSpacing" >
- <number>6</number>
- </property>
- <property name="verticalSpacing" >
- <number>6</number>
- </property>
- <item row="0" column="0" >
- <layout class="QVBoxLayout" >
- <property name="spacing" >
- <number>6</number>
- </property>
- <property name="leftMargin" >
- <number>0</number>
- </property>
- <property name="topMargin" >
- <number>0</number>
- </property>
- <property name="rightMargin" >
- <number>0</number>
- </property>
- <property name="bottomMargin" >
- <number>0</number>
- </property>
+ <layout class="QVBoxLayout" name="verticalLayout" >
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout_4" >
<item>
- <widget class="Q3ButtonGroup" name="statusGroup_" >
+ <widget class="QGroupBox" name="statusGroup_" >
<property name="whatsThis" >
<string>Choose a status; by default Online status is selected.
So all you need to do is just to type in your description.
@@ -61,45 +28,9 @@
<property name="title" >
<string>Status</string>
</property>
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
- <layout class="QGridLayout" >
- <property name="leftMargin" >
- <number>11</number>
- </property>
- <property name="topMargin" >
- <number>11</number>
- </property>
- <property name="rightMargin" >
- <number>11</number>
- </property>
- <property name="bottomMargin" >
- <number>11</number>
- </property>
- <property name="horizontalSpacing" >
- <number>6</number>
- </property>
- <property name="verticalSpacing" >
- <number>6</number>
- </property>
- <item row="0" column="0" >
- <layout class="QVBoxLayout" >
- <property name="spacing" >
- <number>6</number>
- </property>
- <property name="leftMargin" >
- <number>0</number>
- </property>
- <property name="topMargin" >
- <number>0</number>
- </property>
- <property name="rightMargin" >
- <number>0</number>
- </property>
- <property name="bottomMargin" >
- <number>0</number>
- </property>
+ <layout class="QVBoxLayout" name="verticalLayout_3" >
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout_2" >
<item>
<widget class="QRadioButton" name="onlineButton_" >
<property name="toolTip" >
@@ -162,18 +93,9 @@
<property name="spacing" >
<number>6</number>
</property>
- <property name="leftMargin" >
+ <property name="margin" >
<number>0</number>
</property>
- <property name="topMargin" >
- <number>0</number>
- </property>
- <property name="rightMargin" >
- <number>0</number>
- </property>
- <property name="bottomMargin" >
- <number>0</number>
- </property>
<item>
<widget class="QLabel" name="textLabel3" >
<property name="toolTip" >
@@ -211,22 +133,11 @@
</layout>
</item>
</layout>
+ <zorder></zorder>
</widget>
<layoutdefault spacing="6" margin="11" />
<pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <customwidgets>
- <customwidget>
- <class>Q3ButtonGroup</class>
- <extends>Q3GroupBox</extends>
- <header>Qt3Support/Q3ButtonGroup</header>
- <container>1</container>
- </customwidget>
- </customwidgets>
<tabstops>
- <tabstop>onlineButton_</tabstop>
- <tabstop>awayButton_</tabstop>
- <tabstop>invisibleButton_</tabstop>
- <tabstop>offlineButton_</tabstop>
<tabstop>textEdit_</tabstop>
</tabstops>
<resources/>
_______________________________________________
kopete-devel mailing list
kopete-devel@kde.org
https://mail.kde.org/mailman/listinfo/kopete-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic