6 files changed, 101 insertions, 16 deletions
diff --git a/core/pim/addressbook/abconfig.cpp b/core/pim/addressbook/abconfig.cpp
index e58fa76..0b61614 100644
--- a/core/pim/addressbook/abconfig.cpp
+++ b/core/pim/addressbook/abconfig.cpp
@@ -13,2 +13,3 @@ AbConfig::AbConfig( ):
        m_barPos( QMainWindow::Top ),
+        m_fixedBars( true ),
        m_changed( false )
@@ -56,2 +57,6 @@ QMainWindow::ToolBarDock AbConfig::getToolBarPos() const
+bool AbConfig::fixedBars() const
+{
+        return m_fixedBars;
+}
@@ -100,2 +105,8 @@ void AbConfig::setToolBarDock( const QMainWindow::ToolBarDock v )
+void AbConfig::setFixedBars( const bool fixed )
+{
+        m_fixedBars = fixed;
+        m_changed = true;
+}
 void AbConfig::load()
@@ -135,2 +146,3 @@ void AbConfig::load()
        m_barPos = cfg.readNumEntry( "Position", QMainWindow::Top );
+        m_fixedBars= cfg.readBoolEntry( "fixedBars", true );
@@ -162,2 +174,3 @@ void AbConfig::save()
                cfg.writeEntry( "Position", m_barPos );
+                cfg.writeEntry( "fixedBars", m_fixedBars );
@@ -182,2 +195,3 @@ void AbConfig::operator= ( const AbConfig& cnf )
        m_barPos = cnf.m_barPos;
+        m_fixedBars = cnf.m_fixedBars;
 }
diff --git a/core/pim/addressbook/abconfig.h b/core/pim/addressbook/abconfig.h
index b8460d7..ce51b4c 100644
--- a/core/pim/addressbook/abconfig.h
+++ b/core/pim/addressbook/abconfig.h
@@ -21,2 +21,3 @@ public:
    QMainWindow::ToolBarDock getToolBarPos() const;
+    bool fixedBars() const;
    
@@ -30,2 +31,3 @@ public:
    void setToolBarDock( const QMainWindow::ToolBarDock v );
+    void setFixedBars( const bool fixed );
@@ -49,2 +51,3 @@ protected:
    int m_barPos;
+    bool m_fixedBars;
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index 14e5b3f..a5bf19b 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -89,12 +89,10 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
        // Settings for Main Menu
-        setToolBarsMovable( true  );
+        // setToolBarsMovable( false );
+        setToolBarsMovable( !m_config.fixedBars() );
        setRightJustification( true );
-        // Create Toolbar
+        QPEToolBar *bar = new QPEToolBar( this );
-        listTools = new QPEToolBar( this, "list operations" );
+        bar->setHorizontalStretchable( TRUE );
-        listTools->setHorizontalStretchable( true );
-        addToolBar( listTools );
-        moveToolBar( listTools, m_config.getToolBarPos() );
-        QPEMenuBar *mbList = new QPEMenuBar( this  );
+        QPEMenuBar *mbList = new QPEMenuBar( bar  );
        mbList->setMargin( 0 );
@@ -104,2 +102,13 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
+        // Category Menu
+        catMenu = new QPopupMenu( this );
+        catMenu->setCheckable( TRUE );
+        connect( catMenu, SIGNAL(activated(int)), this, SLOT(slotSetCategory(int)) );
+        mbList->insertItem( tr("View"), catMenu );
+        // Create Toolbar
+        listTools = new QPEToolBar( this, "list operations" );
+        listTools->setHorizontalStretchable( true );
+        addToolBar( listTools );
+        moveToolBar( listTools, m_config.getToolBarPos() );
@@ -245,10 +254,7 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
-        // Category Menu
+        // All Categories into view-menu..
-        catMenu = new QPopupMenu( this );
-        catMenu->setCheckable( TRUE );
-        connect( catMenu, SIGNAL(activated(int)), this, SLOT(slotSetCategory(int)) );
        populateCategories();
-        mbList->insertItem( tr("View"), catMenu );
-         defaultFont = new QFont( m_abView->font() );
+        // Fontsize
+        defaultFont = new QFont( m_abView->font() );
         slotSetFont(m_config.fontSize());
diff --git a/core/pim/addressbook/configdlg.cpp b/core/pim/addressbook/configdlg.cpp
index f2f4141..629feef 100644
--- a/core/pim/addressbook/configdlg.cpp
+++ b/core/pim/addressbook/configdlg.cpp
@@ -124,3 +124,4 @@ void ConfigDlg::setConfig( const AbConfig& cnf )
-        
+        m_fixedBars->setChecked( m_config.fixedBars() );
+        m_moveBars->setChecked( !m_config.fixedBars() );
 }
@@ -148,2 +149,4 @@ AbConfig ConfigDlg::getConfig()
+        m_config.setFixedBars( m_fixedBars->isChecked() );
        return m_config;
diff --git a/core/pim/addressbook/configdlg_base.ui b/core/pim/addressbook/configdlg_base.ui
index 308e138..1b5ac17 100644
--- a/core/pim/addressbook/configdlg_base.ui
+++ b/core/pim/addressbook/configdlg_base.ui
@@ -82,3 +82,3 @@
                        <name>margin</name>
-                        <number>5</number>
+                        <number>2</number>
                    </property>
@@ -257,2 +257,61 @@
                    </widget>
+                    <widget>
+                        <class>QButtonGroup</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>ButtonGroup4</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>title</name>
+                            <string>Tool-/Menubar</string>
+                        </property>
+                        <hbox>
+                            <property stdset="1">
+                                <name>margin</name>
+                                <number>11</number>
+                            </property>
+                            <property stdset="1">
+                                <name>spacing</name>
+                                <number>6</number>
+                            </property>
+                            <widget>
+                                <class>QRadioButton</class>
+                                <property stdset="1">
+                                    <name>name</name>
+                                    <cstring>m_fixedBars</cstring>
+                                </property>
+                                <property stdset="1">
+                                    <name>text</name>
+                                    <string>Fixed</string>
+                                </property>
+                                <property stdset="1">
+                                    <name>checked</name>
+                                    <bool>true</bool>
+                                </property>
+                                <property>
+                                    <name>toolTip</name>
+                                    <string></string>
+                                </property>
+                                <property>
+                                    <name>whatsThis</name>
+                                    <string>Switch to fixed menu-/toolbars after restarting application !</string>
+                                </property>
+                            </widget>
+                            <widget>
+                                <class>QRadioButton</class>
+                                <property stdset="1">
+                                    <name>name</name>
+                                    <cstring>m_moveBars</cstring>
+                                </property>
+                                <property stdset="1">
+                                    <name>text</name>
+                                    <string>Movable</string>
+                                </property>
+                                <property>
+                                    <name>whatsThis</name>
+                                    <string>Switch to moveable menu-/toolbars after restarting application !</string>
+                                </property>
+                            </widget>
+                        </hbox>
+                    </widget>
                    <spacer>
diff --git a/core/pim/addressbook/version.h b/core/pim/addressbook/version.h
index 999ce67..d590a86 100644
--- a/core/pim/addressbook/version.h
+++ b/core/pim/addressbook/version.h
@@ -5,3 +5,3 @@
 #define SUBVERSION   "9"
-#define PATCHVERSION "2"
+#define PATCHVERSION "3"

diff --git a/core/pim/addressbook/abconfig.cpp b/core/pim/addressbook/abconfig.cpp index e58fa76..0b61614 100644 --- a/core/pim/addressbook/abconfig.cpp +++ b/core/pim/addressbook/abconfig.cpp
@@ -13,2 +13,3 @@ AbConfig::AbConfig( ):
13	m_barPos( QMainWindow::Top ),	13	m_barPos( QMainWindow::Top ),
		14	m_fixedBars( true ),
14	m_changed( false )	15	m_changed( false )
@@ -56,2 +57,6 @@ QMainWindow::ToolBarDock AbConfig::getToolBarPos() const
56		57
		58	bool AbConfig::fixedBars() const
		59	{
		60	return m_fixedBars;
		61	}
57		62
@@ -100,2 +105,8 @@ void AbConfig::setToolBarDock( const QMainWindow::ToolBarDock v )
100		105
		106	void AbConfig::setFixedBars( const bool fixed )
		107	{
		108	m_fixedBars = fixed;
		109	m_changed = true;
		110	}
		111
101	void AbConfig::load()	112	void AbConfig::load()
@@ -135,2 +146,3 @@ void AbConfig::load()
135	m_barPos = cfg.readNumEntry( "Position", QMainWindow::Top );	146	m_barPos = cfg.readNumEntry( "Position", QMainWindow::Top );
		147	m_fixedBars= cfg.readBoolEntry( "fixedBars", true );
136		148
@@ -162,2 +174,3 @@ void AbConfig::save()
162	cfg.writeEntry( "Position", m_barPos );	174	cfg.writeEntry( "Position", m_barPos );
		175	cfg.writeEntry( "fixedBars", m_fixedBars );
163		176
@@ -182,2 +195,3 @@ void AbConfig::operator= ( const AbConfig& cnf )
182	m_barPos = cnf.m_barPos;	195	m_barPos = cnf.m_barPos;
		196	m_fixedBars = cnf.m_fixedBars;
183	}	197	}


diff --git a/core/pim/addressbook/abconfig.h b/core/pim/addressbook/abconfig.h index b8460d7..ce51b4c 100644 --- a/core/pim/addressbook/abconfig.h +++ b/core/pim/addressbook/abconfig.h
@@ -21,2 +21,3 @@ public:
21	QMainWindow::ToolBarDock getToolBarPos() const;	21	QMainWindow::ToolBarDock getToolBarPos() const;
		22	bool fixedBars() const;
22		23
@@ -30,2 +31,3 @@ public:
30	void setToolBarDock( const QMainWindow::ToolBarDock v );	31	void setToolBarDock( const QMainWindow::ToolBarDock v );
		32	void setFixedBars( const bool fixed );
31		33
@@ -49,2 +51,3 @@ protected:
49	int m_barPos;	51	int m_barPos;
		52	bool m_fixedBars;
50		53


diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp index 14e5b3f..a5bf19b 100644 --- a/core/pim/addressbook/addressbook.cpp +++ b/core/pim/addressbook/addressbook.cpp
@@ -89,12 +89,10 @@ AddressbookWindow::AddressbookWindow( QWidget parent, const char name,
89	// Settings for Main Menu	89	// Settings for Main Menu
90	setToolBarsMovable( true );	90	// setToolBarsMovable( false );
		91	setToolBarsMovable( !m_config.fixedBars() );
91	setRightJustification( true );	92	setRightJustification( true );
92		93
93	// Create Toolbar	94	QPEToolBar *bar = new QPEToolBar( this );
94	listTools = new QPEToolBar( this, "list operations" );	95	bar->setHorizontalStretchable( TRUE );
95	listTools->setHorizontalStretchable( true );
96	addToolBar( listTools );
97	moveToolBar( listTools, m_config.getToolBarPos() );
98		96
99	QPEMenuBar *mbList = new QPEMenuBar( this );	97	QPEMenuBar *mbList = new QPEMenuBar( bar );
100	mbList->setMargin( 0 );	98	mbList->setMargin( 0 );
@@ -104,2 +102,13 @@ AddressbookWindow::AddressbookWindow( QWidget parent, const char name,
104		102
		103	// Category Menu
		104	catMenu = new QPopupMenu( this );
		105	catMenu->setCheckable( TRUE );
		106	connect( catMenu, SIGNAL(activated(int)), this, SLOT(slotSetCategory(int)) );
		107	mbList->insertItem( tr("View"), catMenu );
		108
		109	// Create Toolbar
		110	listTools = new QPEToolBar( this, "list operations" );
		111	listTools->setHorizontalStretchable( true );
		112	addToolBar( listTools );
		113	moveToolBar( listTools, m_config.getToolBarPos() );
105		114
@@ -245,10 +254,7 @@ AddressbookWindow::AddressbookWindow( QWidget parent, const char name,
245		254
246	// Category Menu	255	// All Categories into view-menu..
247	catMenu = new QPopupMenu( this );
248	catMenu->setCheckable( TRUE );
249	connect( catMenu, SIGNAL(activated(int)), this, SLOT(slotSetCategory(int)) );
250	populateCategories();	256	populateCategories();
251	mbList->insertItem( tr("View"), catMenu );
252		257
253	defaultFont = new QFont( m_abView->font() );	258	// Fontsize
		259	defaultFont = new QFont( m_abView->font() );
254	slotSetFont(m_config.fontSize());	260	slotSetFont(m_config.fontSize());


diff --git a/core/pim/addressbook/configdlg.cpp b/core/pim/addressbook/configdlg.cpp index f2f4141..629feef 100644 --- a/core/pim/addressbook/configdlg.cpp +++ b/core/pim/addressbook/configdlg.cpp
@@ -124,3 +124,4 @@ void ConfigDlg::setConfig( const AbConfig& cnf )
124		124
125		125	m_fixedBars->setChecked( m_config.fixedBars() );
		126	m_moveBars->setChecked( !m_config.fixedBars() );
126	}	127	}
@@ -148,2 +149,4 @@ AbConfig ConfigDlg::getConfig()
148		149
		150	m_config.setFixedBars( m_fixedBars->isChecked() );
		151
149	return m_config;	152	return m_config;


diff --git a/core/pim/addressbook/configdlg_base.ui b/core/pim/addressbook/configdlg_base.ui index 308e138..1b5ac17 100644 --- a/core/pim/addressbook/configdlg_base.ui +++ b/core/pim/addressbook/configdlg_base.ui
@@ -82,3 +82,3 @@
82	<name>margin</name>	82	<name>margin</name>
83	<number>5</number>	83	<number>2</number>
84	</property>	84	</property>
@@ -257,2 +257,61 @@
257	</widget>	257	</widget>
		258	<widget>
		259	<class>QButtonGroup</class>
		260	<property stdset="1">
		261	<name>name</name>
		262	<cstring>ButtonGroup4</cstring>
		263	</property>
		264	<property stdset="1">
		265	<name>title</name>
		266	<string>Tool-/Menubar</string>
		267	</property>
		268	<hbox>
		269	<property stdset="1">
		270	<name>margin</name>
		271	<number>11</number>
		272	</property>
		273	<property stdset="1">
		274	<name>spacing</name>
		275	<number>6</number>
		276	</property>
		277	<widget>
		278	<class>QRadioButton</class>
		279	<property stdset="1">
		280	<name>name</name>
		281	<cstring>m_fixedBars</cstring>
		282	</property>
		283	<property stdset="1">
		284	<name>text</name>
		285	<string>Fixed</string>
		286	</property>
		287	<property stdset="1">
		288	<name>checked</name>
		289	<bool>true</bool>
		290	</property>
		291	<property>
		292	<name>toolTip</name>
		293	<string></string>
		294	</property>
		295	<property>
		296	<name>whatsThis</name>
		297	<string>Switch to fixed menu-/toolbars after restarting application !</string>
		298	</property>
		299	</widget>
		300	<widget>
		301	<class>QRadioButton</class>
		302	<property stdset="1">
		303	<name>name</name>
		304	<cstring>m_moveBars</cstring>
		305	</property>
		306	<property stdset="1">
		307	<name>text</name>
		308	<string>Movable</string>
		309	</property>
		310	<property>
		311	<name>whatsThis</name>
		312	<string>Switch to moveable menu-/toolbars after restarting application !</string>
		313	</property>
		314	</widget>
		315	</hbox>
		316	</widget>
258	<spacer>	317	<spacer>


diff --git a/core/pim/addressbook/version.h b/core/pim/addressbook/version.h index 999ce67..d590a86 100644 --- a/core/pim/addressbook/version.h +++ b/core/pim/addressbook/version.h
@@ -5,3 +5,3 @@
5	#define SUBVERSION "9"	5	#define SUBVERSION "9"
6	#define PATCHVERSION "2"	6	#define PATCHVERSION "3"
7		7