[Kmyirc-cvs] kmyirc-ng/src kmigeneralcfg.cpp,NONE,1.1 kmigeneralcfg.h,NONE,1.1 Makefile.am,1.9,1.10 pref.cpp,1.4,1.5 pref.h,1.3,1.4

[<sta...@us...>]

Update of /cvsroot/kmyirc/kmyirc-ng/src
In directory sc8-pr-cvs1:/tmp/cvs-serv18597

Modified Files:
	Makefile.am pref.cpp pref.h 
Added Files:
	kmigeneralcfg.cpp kmigeneralcfg.h 
Log Message:
	* System Tray Icon configuration option skeleton


--- NEW FILE: kmigeneralcfg.cpp ---
#include "kmigeneralcfg.h"

#include <kglobal.h>
#include <klocale.h>
#include <kicontheme.h>
#include <kiconloader.h>
#include <qvariant.h>
#include <qcheckbox.h>
#include <qframe.h>
#include <qlabel.h>
#include <qlayout.h>
#include <qimage.h>
#include <qpixmap.h>

/* 
 *  Constructs a KMIGeneralCfg as a child of 'parent', with the 
 *  name 'name' and widget flags set to 'f'.
 */
KMIGeneralCfg::KMIGeneralCfg( QWidget* parent, const char* name, WFlags fl )
    : QWidget( parent, name, fl )
{
    if ( !name )
	setName( "KMIGeneralCfg" );

    systrayBtn = new QCheckBox( this, "systrayBtn" );
    systrayBtn->setGeometry( QRect( 9, 13, 170, 20 ) );
    systrayBtn->setText( i18n( "Enable System Tray Icon" ) );

    systrayLabel = new QLabel( this, "systrayLabel" );
    systrayLabel->setGeometry( QRect( 10, 30, 480, 50 ) );
    systrayLabel->setMargin( 0 );
    systrayLabel->setText( i18n( "<font size=\"-1\">A System Tray Icon gives you quick access to common action, such as connecting to a server, or quitting KMyIRC.</font>" ) );

    resize( QSize(523, 410).expandedTo(minimumSizeHint()) );
}

/*
 *  Destroys the object and frees any allocated resources
 */
KMIGeneralCfg::~KMIGeneralCfg()
{
    // no need to delete child widgets, Qt does it all for us
}



--- NEW FILE: kmigeneralcfg.h ---
/****************************************************************************
** Form interface generated from reading ui file 'generalcfg.ui'
**
** Created: Dom Mai 18 08:12:51 2003
**      by: The User Interface Compiler ($Id: kmigeneralcfg.h,v 1.1 2003/05/18 13:31:15 stampede_br Exp $)
**
** WARNING! All changes made in this file will be lost!
****************************************************************************/

#ifndef GENERALCFG_H
#define GENERALCFG_H

#include <qvariant.h>
#include <qpixmap.h>
#include <qwidget.h>

class QVBoxLayout;
class QHBoxLayout;
class QGridLayout;
class QCheckBox;
class QFrame;
class QLabel;

class KMIGeneralCfg : public QWidget
{
    Q_OBJECT

public:
    KMIGeneralCfg( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
    ~KMIGeneralCfg();

    QCheckBox* systrayBtn;
    QLabel* systrayLabel;

protected:

};

#endif

Index: Makefile.am
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Makefile.am	11 May 2003 20:09:14 -0000	1.9
+++ Makefile.am	18 May 2003 13:31:14 -0000	1.10
@@ -14,7 +14,7 @@
 kmyirc_LDADD   = $(LIB_KFILE) $(LIB_KDEPRINT)
 
 # which sources should be compiled for kmyirc
-kmyirc_SOURCES = main.cpp kmyirc.cpp kmyircview.cpp pref.cpp kmyirciface.skel ircservercfg.ui kmiircservercfg.cpp kmiircservercfg.h groupdlg.ui kmigroupdlg.cpp kmigroupdlg.h serverdlg.ui kmiserverdlg.cpp kmiserverdlg.h avatardlg.ui kmiavatardlg.cpp kmiavatardlg.h nickname.ui kminickdlg.cpp kminickdlg.h kmiircmessage.h kmiircmessage.cpp kmiircsocket.h kmiircsocket.cpp kmisystray.cpp kmisocket.cpp
+kmyirc_SOURCES = main.cpp kmyirc.cpp kmyircview.cpp pref.cpp kmyirciface.skel ircservercfg.ui kmiircservercfg.cpp kmiircservercfg.h groupdlg.ui kmigroupdlg.cpp kmigroupdlg.h serverdlg.ui kmiserverdlg.cpp kmiserverdlg.h avatardlg.ui kmiavatardlg.cpp kmiavatardlg.h nickname.ui kminickdlg.cpp kminickdlg.h kmiircmessage.h kmiircmessage.cpp kmiircsocket.h kmiircsocket.cpp kmisystray.cpp kmisocket.cpp kmigeneralcfg.cpp
 
 # these are the headers for your project
 noinst_HEADERS = kmyirc.h kmyircview.h pref.h

Index: pref.cpp
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/pref.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- pref.cpp	29 Apr 2003 15:22:55 -0000	1.4
+++ pref.cpp	18 May 2003 13:31:15 -0000	1.5
@@ -5,46 +5,34 @@
 #include "pref.h"
 
 #include <klocale.h>
+#include <kglobal.h>
+#include <kiconloader.h>
+#include <kicontheme.h>
 
 #include <qlayout.h>
 #include <qlabel.h>
 
 KMyIRCPreferences::KMyIRCPreferences()
-    : KDialogBase(TreeList, i18n("KMyIRC Preferences"),
+    : KDialogBase(IconList, i18n("KMyIRC Preferences"),
                   Help|Default|Ok|Cancel, Ok)
 {
     // this is the base class for your preferences dialog.  it is now
     // a Treelist dialog.. but there are a number of other
     // possibilities (including Tab, Swallow, and just Plain)
 	setMinimumSize(600,400);
-    QFrame *frame;
-    frame = addPage(i18n("IRC Server List"), i18n("IRC Server List"));
-    m_pageOne = new KMIIRCServerCfg(frame,"ircServerCfg");
-	m_pageOne->show();
-	frame->setMinimumSize(m_pageOne->sizeHint());
+	QFrame *frame;
+	frame = addPage(i18n("General"), i18n("General Options"),
+		KGlobal::iconLoader()->loadIcon("kmyirc", KIcon::MainToolbar, 32) );
+	m_pageOne = new KMIGeneralCfg(frame);
+	frame = addPage(i18n("IRC Server List"), i18n("IRC Server List"),
+		KGlobal::iconLoader()->loadIcon("network", KIcon::MainToolbar, 32) );
+	m_pageTwo = new KMIIRCServerCfg(frame,"ircServerCfg");
+	m_pageTwo->show();
+	frame->setMinimumSize(m_pageTwo->sizeHint());
 	resize(frame->sizeHint());
-    // frame = addPage(i18n("Second Page"), i18n("Page Two Options"));
-    // m_pageTwo = new KMyIRCPrefPageTwo(frame);
 }
 KMyIRCPreferences::~ KMyIRCPreferences()
 {
 }
 
-KMyIRCPrefPageOne::KMyIRCPrefPageOne(QWidget *parent)
-    : QFrame(parent)
-{
-    QHBoxLayout *layout = new QHBoxLayout(this);
-    layout->setAutoAdd(true);
-
-    new QLabel(i18n("Add something here"), this);
-}
-
-KMyIRCPrefPageTwo::KMyIRCPrefPageTwo(QWidget *parent)
-    : QFrame(parent)
-{
-    QHBoxLayout *layout = new QHBoxLayout(this);
-    layout->setAutoAdd(true);
-
-    new QLabel(i18n("Add something here"), this);
-}
 #include "pref.moc"

Index: pref.h
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/pref.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- pref.h	29 Apr 2003 15:22:55 -0000	1.3
+++ pref.h	18 May 2003 13:31:15 -0000	1.4
@@ -8,9 +8,8 @@
 #include <kdialogbase.h>
 #include <qframe.h>
 #include "kmiircservercfg.h"
+#include "kmigeneralcfg.h"
 
-class KMyIRCPrefPageOne;
-class KMyIRCPrefPageTwo;
 /**
  * This is the main configuration class.
  * In this class you call all other configuration dialogs.
@@ -35,22 +34,8 @@
    ~KMyIRCPreferences();
 
 private:
-    KMIIRCServerCfg *m_pageOne;
-    KMyIRCPrefPageTwo *m_pageTwo;
-};
-
-class KMyIRCPrefPageOne : public QFrame
-{
-    Q_OBJECT
-public:
-    KMyIRCPrefPageOne(QWidget *parent = 0);
-};
-
-class KMyIRCPrefPageTwo : public QFrame
-{
-    Q_OBJECT
-public:
-    KMyIRCPrefPageTwo(QWidget *parent = 0);
+    KMIGeneralCfg   *m_pageOne;
+    KMIIRCServerCfg *m_pageTwo;
 };
 
 #endif // _KMYIRCPREF_H_