summaryrefslogtreecommitdiffabout
path: root/microkde
Unidiff
Diffstat (limited to 'microkde') (more/less context) (ignore whitespace changes)
-rw-r--r--microkde/kapplication.cpp4
-rw-r--r--microkde/kdeui/ktoolbar.cpp14
-rw-r--r--microkde/kdeui/ktoolbar.h4
3 files changed, 18 insertions, 4 deletions
diff --git a/microkde/kapplication.cpp b/microkde/kapplication.cpp
index f36c5ae..d7c12bb 100644
--- a/microkde/kapplication.cpp
+++ b/microkde/kapplication.cpp
@@ -1,249 +1,251 @@
1#include <stdlib.h> 1#include <stdlib.h>
2#include <stdio.h> 2#include <stdio.h>
3 3
4#include "kapplication.h" 4#include "kapplication.h"
5#include "ktextedit.h" 5#include "ktextedit.h"
6#include <qapplication.h> 6#include <qapplication.h>
7#include <qstring.h> 7#include <qstring.h>
8#include <qfile.h> 8#include <qfile.h>
9#include <qtextstream.h> 9#include <qtextstream.h>
10#include <qdialog.h> 10#include <qdialog.h>
11#include <qlayout.h> 11#include <qlayout.h>
12#include <qtextbrowser.h> 12#include <qtextbrowser.h>
13#include <qregexp.h> 13#include <qregexp.h>
14 14
15int KApplication::random() 15int KApplication::random()
16{ 16{
17 return rand(); 17 return rand();
18} 18}
19 19
20//US 20//US
21QString KApplication::randomString(int length) 21QString KApplication::randomString(int length)
22{ 22{
23 if (length <=0 ) return QString::null; 23 if (length <=0 ) return QString::null;
24 24
25 QString str; 25 QString str;
26 while (length--) 26 while (length--)
27 { 27 {
28 int r=random() % 62; 28 int r=random() % 62;
29 r+=48; 29 r+=48;
30 if (r>57) r+=7; 30 if (r>57) r+=7;
31 if (r>90) r+=6; 31 if (r>90) r+=6;
32 str += char(r); 32 str += char(r);
33 // so what if I work backwards? 33 // so what if I work backwards?
34 } 34 }
35 return str; 35 return str;
36} 36}
37int KApplication::execDialog( QDialog* d ) 37int KApplication::execDialog( QDialog* d )
38{ 38{
39 if (QApplication::desktop()->width() <= 640 ) 39 if (QApplication::desktop()->width() <= 640 )
40 d->showMaximized(); 40 d->showMaximized();
41 else 41 else
42 ;//d->resize( 800, 600 ); 42 ;//d->resize( 800, 600 );
43 return d->exec(); 43 return d->exec();
44} 44}
45void KApplication::showLicence() 45void KApplication::showLicence()
46{ 46{
47 KApplication::showFile( "KDE-Pim/Pi licence", "kdepim/licence.txt" ); 47 KApplication::showFile( "KDE-Pim/Pi licence", "kdepim/licence.txt" );
48} 48}
49 49
50void KApplication::testCoords( int* x, int* y, int* wid, int * hei ) 50void KApplication::testCoords( int* x, int* y, int* wid, int * hei )
51{ 51{
52 int dWid = QApplication::desktop()->width() ; 52 int dWid = QApplication::desktop()->width() ;
53 int dHei = QApplication::desktop()->height(); 53 int dHei = QApplication::desktop()->height();
54 if ( *x < 0 ) *x = 0;
55 if ( *y < 20 ) *y = 20 ;
54 if ( *x + *wid > dWid ) { 56 if ( *x + *wid > dWid ) {
55 *x = 0; 57 *x = 0;
56 if ( *wid > dWid ) 58 if ( *wid > dWid )
57 *wid = dWid; 59 *wid = dWid;
58 } 60 }
59 if ( *y + *hei > dHei ) { 61 if ( *y + *hei > dHei ) {
60 *y = 0; 62 *y = 20;
61 if ( *hei > dHei ) 63 if ( *hei > dHei )
62 *hei = dHei; 64 *hei = dHei;
63 } 65 }
64} 66}
65void KApplication::showFile(QString caption, QString fn) 67void KApplication::showFile(QString caption, QString fn)
66{ 68{
67 QString text; 69 QString text;
68 QString fileName; 70 QString fileName;
69#ifndef DESKTOP_VERSION 71#ifndef DESKTOP_VERSION
70 fileName = getenv("QPEDIR"); 72 fileName = getenv("QPEDIR");
71 fileName += "/pics/" + fn ; 73 fileName += "/pics/" + fn ;
72#else 74#else
73 fileName = qApp->applicationDirPath () + "/" + fn; 75 fileName = qApp->applicationDirPath () + "/" + fn;
74#endif 76#endif
75 QFile file( fileName ); 77 QFile file( fileName );
76 if (!file.open( IO_ReadOnly ) ) { 78 if (!file.open( IO_ReadOnly ) ) {
77 return ; 79 return ;
78 } 80 }
79 QTextStream ts( &file ); 81 QTextStream ts( &file );
80 text = ts.read(); 82 text = ts.read();
81 file.close(); 83 file.close();
82 KApplication::showText( caption, text ); 84 KApplication::showText( caption, text );
83 85
84} 86}
85 87
86bool KApplication::convert2latin1(QString fileName) 88bool KApplication::convert2latin1(QString fileName)
87{ 89{
88 QString text; 90 QString text;
89 QFile file( fileName ); 91 QFile file( fileName );
90 if (!file.open( IO_ReadOnly ) ) { 92 if (!file.open( IO_ReadOnly ) ) {
91 return false; 93 return false;
92 94
93 } 95 }
94 QTextStream ts( &file ); 96 QTextStream ts( &file );
95 ts.setEncoding( QTextStream::UnicodeUTF8 ); 97 ts.setEncoding( QTextStream::UnicodeUTF8 );
96 text = ts.read(); 98 text = ts.read();
97 file.close(); 99 file.close();
98 if (!file.open( IO_WriteOnly ) ) { 100 if (!file.open( IO_WriteOnly ) ) {
99 return false; 101 return false;
100 } 102 }
101 QTextStream tsIn( &file ); 103 QTextStream tsIn( &file );
102 tsIn.setEncoding( QTextStream::Latin1 ); 104 tsIn.setEncoding( QTextStream::Latin1 );
103 tsIn << text.latin1(); 105 tsIn << text.latin1();
104 file.close(); 106 file.close();
105 return true; 107 return true;
106 108
107 109
108} 110}
109void KApplication::showText(QString caption, QString text) 111void KApplication::showText(QString caption, QString text)
110{ 112{
111 QDialog dia( 0, "name", true ); ; 113 QDialog dia( 0, "name", true ); ;
112 dia.setCaption( caption ); 114 dia.setCaption( caption );
113 QVBoxLayout* lay = new QVBoxLayout( &dia ); 115 QVBoxLayout* lay = new QVBoxLayout( &dia );
114 lay->setSpacing( 3 ); 116 lay->setSpacing( 3 );
115 lay->setMargin( 3 ); 117 lay->setMargin( 3 );
116 KTextEdit tb ( &dia ); 118 KTextEdit tb ( &dia );
117 tb.setWordWrap( QMultiLineEdit::WidgetWidth ); 119 tb.setWordWrap( QMultiLineEdit::WidgetWidth );
118 lay->addWidget( &tb ); 120 lay->addWidget( &tb );
119 tb.setText( text ); 121 tb.setText( text );
120#ifdef DESKTOP_VERSION 122#ifdef DESKTOP_VERSION
121 dia.resize( 640, 480); 123 dia.resize( 640, 480);
122#else 124#else
123 dia.showMaximized(); 125 dia.showMaximized();
124#endif 126#endif
125 dia.exec(); 127 dia.exec();
126 128
127} 129}
128 130
129#include <qlabel.h> 131#include <qlabel.h>
130#include <qpushbutton.h> 132#include <qpushbutton.h>
131#include <qlayout.h> 133#include <qlayout.h>
132#include <qdir.h> 134#include <qdir.h>
133#include <qradiobutton.h> 135#include <qradiobutton.h>
134#include <qbuttongroup.h> 136#include <qbuttongroup.h>
135#include "kglobal.h" 137#include "kglobal.h"
136#include "klocale.h" 138#include "klocale.h"
137 139
138class KBackupPrefs : public QDialog 140class KBackupPrefs : public QDialog
139{ 141{
140 public: 142 public:
141 KBackupPrefs( QString message , QWidget *parent=0, const char *name=0 ) : 143 KBackupPrefs( QString message , QWidget *parent=0, const char *name=0 ) :
142 QDialog( parent, name, true ) 144 QDialog( parent, name, true )
143 { 145 {
144 setCaption( i18n("Backup Failed!") ); 146 setCaption( i18n("Backup Failed!") );
145 QVBoxLayout* lay = new QVBoxLayout( this ); 147 QVBoxLayout* lay = new QVBoxLayout( this );
146 lay->setSpacing( 3 ); 148 lay->setSpacing( 3 );
147 lay->setMargin( 3 ); 149 lay->setMargin( 3 );
148 QLabel * lab = new QLabel( message, this ); 150 QLabel * lab = new QLabel( message, this );
149 lay->addWidget( lab ); 151 lay->addWidget( lab );
150 QButtonGroup* format = new QButtonGroup( 1, Horizontal, i18n("Choose action"), this ); 152 QButtonGroup* format = new QButtonGroup( 1, Horizontal, i18n("Choose action"), this );
151 lay->addWidget( format ); 153 lay->addWidget( format );
152 format->setExclusive ( true ) ; 154 format->setExclusive ( true ) ;
153 vcal = new QRadioButton(i18n("Try again now"), format ); 155 vcal = new QRadioButton(i18n("Try again now"), format );
154 tcal = new QRadioButton(i18n("Try again later"), format ); 156 tcal = new QRadioButton(i18n("Try again later"), format );
155 ical = new QRadioButton(i18n("Try again tomorrow"), format ); 157 ical = new QRadioButton(i18n("Try again tomorrow"), format );
156 ocal = new QRadioButton(i18n("Disable backup"), format ); 158 ocal = new QRadioButton(i18n("Disable backup"), format );
157 vcal->setChecked( true ); 159 vcal->setChecked( true );
158 QPushButton * ok = new QPushButton( i18n("OK"), this ); 160 QPushButton * ok = new QPushButton( i18n("OK"), this );
159 lay->addWidget(ok ); 161 lay->addWidget(ok );
160 connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() ) ); 162 connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() ) );
161 } 163 }
162 164
163 bool again() { return vcal->isChecked(); } 165 bool again() { return vcal->isChecked(); }
164 bool later() { return tcal->isChecked(); } 166 bool later() { return tcal->isChecked(); }
165 bool againTomorrow() { return ical->isChecked(); } 167 bool againTomorrow() { return ical->isChecked(); }
166private: 168private:
167 QRadioButton* vcal, *ical, *ocal, *tcal; 169 QRadioButton* vcal, *ical, *ocal, *tcal;
168}; 170};
169int KApplication::createBackup( QString fn, QString dp, int numBup ) 171int KApplication::createBackup( QString fn, QString dp, int numBup )
170{ 172{
171 if ( numBup < 1) return 3; 173 if ( numBup < 1) return 3;
172 int ret = 3; 174 int ret = 3;
173 //qDebug("KApplication::createBackup %s --- %s --- %d", fn.latin1(), dp.latin1(), numBup); 175 //qDebug("KApplication::createBackup %s --- %s --- %d", fn.latin1(), dp.latin1(), numBup);
174 QDir bupDir ( dp ); 176 QDir bupDir ( dp );
175 bool tryAgain = true; 177 bool tryAgain = true;
176 while ( tryAgain ) { 178 while ( tryAgain ) {
177 if ( !bupDir.exists() ) { 179 if ( !bupDir.exists() ) {
178 QString bd = dp.right(25); 180 QString bd = dp.right(25);
179 if ( dp.length() > 25 ) 181 if ( dp.length() > 25 )
180 bd = "..." + bd; 182 bd = "..." + bd;
181 KBackupPrefs noDir( i18n("<b>Backup directory does not exist: </b>") + bd); 183 KBackupPrefs noDir( i18n("<b>Backup directory does not exist: </b>") + bd);
182 if ( !noDir.exec() ) return 3; 184 if ( !noDir.exec() ) return 3;
183 if ( noDir.againTomorrow() ) { 185 if ( noDir.againTomorrow() ) {
184 return 0; 186 return 0;
185 } else if ( noDir.later() ) { 187 } else if ( noDir.later() ) {
186 return 3; 188 return 3;
187 } else if ( !noDir.again() ) { 189 } else if ( !noDir.again() ) {
188 return 2; 190 return 2;
189 } 191 }
190 } else { 192 } else {
191 tryAgain = false; 193 tryAgain = false;
192 } 194 }
193 } 195 }
194 // we have a valid dir! 196 // we have a valid dir!
195 QStringList allFileList = bupDir.entryList(QDir::Files); 197 QStringList allFileList = bupDir.entryList(QDir::Files);
196 QFileInfo fileInfo ( fn ); 198 QFileInfo fileInfo ( fn );
197 QString fName = fileInfo.fileName (); 199 QString fName = fileInfo.fileName ();
198 QStringList fileList; 200 QStringList fileList;
199 201
200 int i; 202 int i;
201 for ( i = 0; i < allFileList.count(); ++i ) { 203 for ( i = 0; i < allFileList.count(); ++i ) {
202 QString fi = allFileList[i]; 204 QString fi = allFileList[i];
203 if ( fi. find( fName ) > -1 ) 205 if ( fi. find( fName ) > -1 )
204 fileList.append( fi ); 206 fileList.append( fi );
205 } 207 }
206 qDebug("KApp: %d backup files exist ", fileList.count()); 208 qDebug("KApp: %d backup files exist ", fileList.count());
207 int count = fileList.count(); 209 int count = fileList.count();
208 fileList.sort(); 210 fileList.sort();
209 int remCount = 0; 211 int remCount = 0;
210 while ( count >= numBup ) { 212 while ( count >= numBup ) {
211 QString fnr = dp + "/"+fileList[remCount]; 213 QString fnr = dp + "/"+fileList[remCount];
212 QFile::remove( fnr ); 214 QFile::remove( fnr );
213 --count; 215 --count;
214 ++remCount; 216 ++remCount;
215 } 217 }
216 QDateTime mRunStart = QDateTime::currentDateTime(); 218 QDateTime mRunStart = QDateTime::currentDateTime();
217 QString file = "%1%2%3-%4%5%6-"; 219 QString file = "%1%2%3-%4%5%6-";
218 file = file.arg( mRunStart.date().year(), 4).arg( mRunStart.date().month(),2 ).arg( mRunStart.date().day(), 2 ).arg( mRunStart.time().hour(),2 ).arg( mRunStart.time().minute(),2 ).arg( mRunStart.time().second(),2 ); 220 file = file.arg( mRunStart.date().year(), 4).arg( mRunStart.date().month(),2 ).arg( mRunStart.date().day(), 2 ).arg( mRunStart.time().hour(),2 ).arg( mRunStart.time().minute(),2 ).arg( mRunStart.time().second(),2 );
219 file.replace ( QRegExp (" "), "0" ); 221 file.replace ( QRegExp (" "), "0" );
220 file += fName ; 222 file += fName ;
221 file = dp + file; 223 file = dp + file;
222 QString command; 224 QString command;
223 int res = 0; 225 int res = 0;
224#ifdef _WIN32_ 226#ifdef _WIN32_
225 command = "copy \""+ QDir::convertSeparators( fn)+ "\" \""+QDir::convertSeparators(file)+ "\" "; 227 command = "copy \""+ QDir::convertSeparators( fn)+ "\" \""+QDir::convertSeparators(file)+ "\" ";
226#else 228#else
227 command = "cp "+ fn+ " "+file; 229 command = "cp "+ fn+ " "+file;
228#endif 230#endif
229 //qDebug("command %s ",command.latin1() ); 231 //qDebug("command %s ",command.latin1() );
230 tryAgain = true; 232 tryAgain = true;
231 while ( tryAgain ) { 233 while ( tryAgain ) {
232 res = system ( command.latin1() ); 234 res = system ( command.latin1() );
233 qDebug("KApp: Copy result %d ", res); 235 qDebug("KApp: Copy result %d ", res);
234 if ( res != 0 ) { 236 if ( res != 0 ) {
235 KBackupPrefs noDir( i18n("<b>The backup copy command failed!</b>")); 237 KBackupPrefs noDir( i18n("<b>The backup copy command failed!</b>"));
236 if ( !noDir.exec() ) return 3; 238 if ( !noDir.exec() ) return 3;
237 if ( noDir.againTomorrow() ) { 239 if ( noDir.againTomorrow() ) {
238 return 0; 240 return 0;
239 } else if ( noDir.later() ) { 241 } else if ( noDir.later() ) {
240 return 3; 242 return 3;
241 } else if ( !noDir.again() ) { 243 } else if ( !noDir.again() ) {
242 return 2; 244 return 2;
243 } 245 }
244 } else { 246 } else {
245 tryAgain = false; 247 tryAgain = false;
246 } 248 }
247 } 249 }
248 return 1; 250 return 1;
249} 251}
diff --git a/microkde/kdeui/ktoolbar.cpp b/microkde/kdeui/ktoolbar.cpp
index df2aad8..027e5e9 100644
--- a/microkde/kdeui/ktoolbar.cpp
+++ b/microkde/kdeui/ktoolbar.cpp
@@ -1,2268 +1,2278 @@
1/* This file is part of the KDE libraries 1/* This file is part of the KDE libraries
2 Copyright 2 Copyright
3 (C) 2000 Reginald Stadlbauer (reggie@kde.org) 3 (C) 2000 Reginald Stadlbauer (reggie@kde.org)
4 (C) 1997, 1998 Stephan Kulow (coolo@kde.org) 4 (C) 1997, 1998 Stephan Kulow (coolo@kde.org)
5 (C) 1997, 1998 Mark Donohoe (donohoe@kde.org) 5 (C) 1997, 1998 Mark Donohoe (donohoe@kde.org)
6 (C) 1997, 1998 Sven Radej (radej@kde.org) 6 (C) 1997, 1998 Sven Radej (radej@kde.org)
7 (C) 1997, 1998 Matthias Ettrich (ettrich@kde.org) 7 (C) 1997, 1998 Matthias Ettrich (ettrich@kde.org)
8 (C) 1999 Chris Schlaeger (cs@kde.org) 8 (C) 1999 Chris Schlaeger (cs@kde.org)
9 (C) 1999 Kurt Granroth (granroth@kde.org) 9 (C) 1999 Kurt Granroth (granroth@kde.org)
10 10
11 This library is free software; you can redistribute it and/or 11 This library is free software; you can redistribute it and/or
12 modify it under the terms of the GNU Library General Public 12 modify it under the terms of the GNU Library General Public
13 License version 2 as published by the Free Software Foundation. 13 License version 2 as published by the Free Software Foundation.
14 14
15 This library is distributed in the hope that it will be useful, 15 This library is distributed in the hope that it will be useful,
16 but WITHOUT ANY WARRANTY; without even the implied warranty of 16 but WITHOUT ANY WARRANTY; without even the implied warranty of
17 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 17 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
18 Library General Public License for more details. 18 Library General Public License for more details.
19 19
20 You should have received a copy of the GNU Library General Public License 20 You should have received a copy of the GNU Library General Public License
21 along with this library; see the file COPYING.LIB. If not, write to 21 along with this library; see the file COPYING.LIB. If not, write to
22 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, 22 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
23 Boston, MA 02111-1307, USA. 23 Boston, MA 02111-1307, USA.
24*/ 24*/
25 25
26#ifdef KDE_USE_FINAL 26#ifdef KDE_USE_FINAL
27#undef Always 27#undef Always
28#include <qdockwindow.h> 28#include <qdockwindow.h>
29#endif 29#endif
30 30
31 31
32 32
33#include "ktoolbar.h" 33#include "ktoolbar.h"
34#include "kmainwindow.h" 34#include "kmainwindow.h"
35 35
36#include <string.h> 36#include <string.h>
37 37
38#include <qpainter.h> 38#include <qpainter.h>
39#include <qtooltip.h> 39#include <qtooltip.h>
40#include <qdrawutil.h> 40#include <qdrawutil.h>
41#include <qstring.h> 41#include <qstring.h>
42#include <qrect.h> 42#include <qrect.h>
43#include <qobjectlist.h> 43#include <qobjectlist.h>
44#include <qtimer.h> 44#include <qtimer.h>
45#include <qstyle.h> 45#include <qstyle.h>
46#include <qapplication.h> 46#include <qapplication.h>
47 47
48//US #include <config.h> 48//US #include <config.h>
49 49
50#include "klineedit.h" 50#include "klineedit.h"
51#include "kseparator.h" 51#include "kseparator.h"
52#include <klocale.h> 52#include <klocale.h>
53#include <kapplication.h> 53#include <kapplication.h>
54#include <kaction.h> 54#include <kaction.h>
55#include <kstdaction.h> 55#include <kstdaction.h>
56#include <kglobal.h> 56#include <kglobal.h>
57#include <kconfig.h> 57#include <kconfig.h>
58#include <kiconloader.h> 58#include <kiconloader.h>
59#include <kcombobox.h> 59#include <kcombobox.h>
60//US #include <kpopupmenu.h> 60//US #include <kpopupmenu.h>
61//US #include <kanimwidget.h> 61//US #include <kanimwidget.h>
62//US #include <kipc.h> 62//US #include <kipc.h>
63//US #include <kwin.h> 63//US #include <kwin.h>
64#include <kdebug.h> 64#include <kdebug.h>
65#include <qlayout.h> 65#include <qlayout.h>
66 66
67#include "ktoolbarbutton.h" 67#include "ktoolbarbutton.h"
68 68
69//US 69//US
70#include "kconfigbase.h" 70#include "kconfigbase.h"
71 71
72#include <qpopupmenu.h> 72#include <qpopupmenu.h>
73#include <qmainwindow.h> 73#include <qmainwindow.h>
74 74
75enum { 75enum {
76 CONTEXT_TOP = 0, 76 CONTEXT_TOP = 0,
77 CONTEXT_LEFT = 1, 77 CONTEXT_LEFT = 1,
78 CONTEXT_RIGHT = 2, 78 CONTEXT_RIGHT = 2,
79 CONTEXT_BOTTOM = 3, 79 CONTEXT_BOTTOM = 3,
80 CONTEXT_FLOAT = 4, 80 CONTEXT_FLOAT = 4,
81 CONTEXT_FLAT = 5, 81 CONTEXT_FLAT = 5,
82 CONTEXT_ICONS = 6, 82 CONTEXT_ICONS = 6,
83 CONTEXT_TEXT = 7, 83 CONTEXT_TEXT = 7,
84 CONTEXT_TEXTRIGHT = 8, 84 CONTEXT_TEXTRIGHT = 8,
85 CONTEXT_TEXTUNDER = 9, 85 CONTEXT_TEXTUNDER = 9,
86 CONTEXT_ICONSIZES = 50 // starting point for the icon size list, put everything else before 86 CONTEXT_ICONSIZES = 50 // starting point for the icon size list, put everything else before
87}; 87};
88 88
89class KToolBarPrivate 89class KToolBarPrivate
90{ 90{
91public: 91public:
92 KToolBarPrivate() { 92 KToolBarPrivate() {
93 m_iconSize = 0; 93 m_iconSize = 0;
94 m_iconText = KToolBar::IconOnly; 94 m_iconText = KToolBar::IconOnly;
95 m_highlight = true; 95 m_highlight = true;
96 m_transparent = true; 96 m_transparent = true;
97 m_honorStyle = false; 97 m_honorStyle = false;
98 98
99 m_enableContext = true; 99 m_enableContext = true;
100 100
101 m_xmlguiClient = 0; 101 m_xmlguiClient = 0;
102 m_configurePlugged = false; 102 m_configurePlugged = false;
103 103
104//US oldPos = Qt::DockUnmanaged; 104//US oldPos = Qt::DockUnmanaged;
105 oldPos = QMainWindow::Unmanaged; 105 oldPos = QMainWindow::Unmanaged;
106 106
107 modified = m_isHorizontal = positioned = FALSE; 107 modified = m_isHorizontal = positioned = FALSE;
108 108
109 HiddenDefault = false; 109 HiddenDefault = false;
110 IconSizeDefault = 0; 110 IconSizeDefault = 0;
111 IconTextDefault = "IconOnly"; 111 IconTextDefault = "IconOnly";
112 IndexDefault = -1; 112 IndexDefault = -1;
113 NewLineDefault = false; 113 NewLineDefault = false;
114 OffsetDefault = -1; 114 OffsetDefault = -1;
115 PositionDefault = "Top"; 115 PositionDefault = "Top";
116 idleButtons.setAutoDelete(true); 116 idleButtons.setAutoDelete(true);
117 } 117 }
118 118
119 int m_iconSize; 119 int m_iconSize;
120 KToolBar::IconText m_iconText; 120 KToolBar::IconText m_iconText;
121 bool m_highlight : 1; 121 bool m_highlight : 1;
122 bool m_transparent : 1; 122 bool m_transparent : 1;
123 bool m_honorStyle : 1; 123 bool m_honorStyle : 1;
124 bool m_isHorizontal : 1; 124 bool m_isHorizontal : 1;
125 bool m_enableContext : 1; 125 bool m_enableContext : 1;
126 bool m_configurePlugged : 1; 126 bool m_configurePlugged : 1;
127 bool modified : 1; 127 bool modified : 1;
128 bool positioned : 1; 128 bool positioned : 1;
129 129
130 QWidget *m_parent; 130 QWidget *m_parent;
131 131
132 QMainWindow::ToolBarDock oldPos; 132 QMainWindow::ToolBarDock oldPos;
133 133
134 KXMLGUIClient *m_xmlguiClient; 134 KXMLGUIClient *m_xmlguiClient;
135 135
136 struct ToolBarInfo 136 struct ToolBarInfo
137 { 137 {
138//US ToolBarInfo() : index( 0 ), offset( -1 ), newline( FALSE ), dock( Qt::DockTop ) {} 138//US ToolBarInfo() : index( 0 ), offset( -1 ), newline( FALSE ), dock( Qt::DockTop ) {}
139 ToolBarInfo() : index( 0 ), offset( -1 ), newline( FALSE ), dock( QMainWindow::Top ) {} 139 ToolBarInfo() : index( 0 ), offset( -1 ), newline( FALSE ), dock( QMainWindow::Top ) {}
140//US ToolBarInfo( Qt::Dock d, int i, bool n, int o ) : index( i ), offset( o ), newline( n ), dock( d ) {} 140//US ToolBarInfo( Qt::Dock d, int i, bool n, int o ) : index( i ), offset( o ), newline( n ), dock( d ) {}
141 ToolBarInfo( QMainWindow::ToolBarDock d, int i, bool n, int o ) : index( i ), offset( o ), newline( n ), dock( d ) {} 141 ToolBarInfo( QMainWindow::ToolBarDock d, int i, bool n, int o ) : index( i ), offset( o ), newline( n ), dock( d ) {}
142 int index, offset; 142 int index, offset;
143 bool newline; 143 bool newline;
144//US Qt::Dock dock; 144//US Qt::Dock dock;
145 QMainWindow::ToolBarDock dock; 145 QMainWindow::ToolBarDock dock;
146 }; 146 };
147 147
148 ToolBarInfo toolBarInfo; 148 ToolBarInfo toolBarInfo;
149 QValueList<int> iconSizes; 149 QValueList<int> iconSizes;
150 QTimer repaintTimer; 150 QTimer repaintTimer;
151 151
152 // Default Values. 152 // Default Values.
153 bool HiddenDefault; 153 bool HiddenDefault;
154 int IconSizeDefault; 154 int IconSizeDefault;
155 QString IconTextDefault; 155 QString IconTextDefault;
156 int IndexDefault; 156 int IndexDefault;
157 bool NewLineDefault; 157 bool NewLineDefault;
158 int OffsetDefault; 158 int OffsetDefault;
159 QString PositionDefault; 159 QString PositionDefault;
160 160
161 QPtrList<QWidget> idleButtons; 161 QPtrList<QWidget> idleButtons;
162}; 162};
163 163
164KToolBarSeparator::KToolBarSeparator(Orientation o , bool l, QToolBar *parent, 164KToolBarSeparator::KToolBarSeparator(Orientation o , bool l, QToolBar *parent,
165 const char* name ) 165 const char* name )
166 :QFrame( parent, name ), line( l ) 166 :QFrame( parent, name ), line( l )
167{ 167{
168 connect( parent, SIGNAL(orientationChanged(Orientation)), 168 connect( parent, SIGNAL(orientationChanged(Orientation)),
169 this, SLOT(setOrientation(Orientation)) ); 169 this, SLOT(setOrientation(Orientation)) );
170 setOrientation( o ); 170 setOrientation( o );
171 setBackgroundMode( parent->backgroundMode() ); 171 setBackgroundMode( parent->backgroundMode() );
172 setBackgroundOrigin( ParentOrigin ); 172 setBackgroundOrigin( ParentOrigin );
173} 173}
174 174
175void KToolBarSeparator::setOrientation( Orientation o ) 175void KToolBarSeparator::setOrientation( Orientation o )
176{ 176{
177 orient = o; 177 orient = o;
178 if ( line ) { 178 if ( line ) {
179 if ( orientation() == Vertical ) 179 if ( orientation() == Vertical )
180 setFrameStyle( HLine + Sunken ); 180 setFrameStyle( HLine + Sunken );
181 else 181 else
182 setFrameStyle( VLine + Sunken ); 182 setFrameStyle( VLine + Sunken );
183 } else { 183 } else {
184 setFrameStyle( NoFrame ); 184 setFrameStyle( NoFrame );
185 } 185 }
186} 186}
187 187
188void KToolBarSeparator::styleChange( QStyle& ) 188void KToolBarSeparator::styleChange( QStyle& )
189{ 189{
190 setOrientation( orient ); 190 setOrientation( orient );
191} 191}
192 192
193QSize KToolBarSeparator::sizeHint() const 193QSize KToolBarSeparator::sizeHint() const
194{ 194{
195 return orientation() == Vertical ? QSize( 0, 6 ) : QSize( 6, 0 ); 195 return orientation() == Vertical ? QSize( 0, 6 ) : QSize( 6, 0 );
196} 196}
197 197
198QSizePolicy KToolBarSeparator::sizePolicy() const 198QSizePolicy KToolBarSeparator::sizePolicy() const
199{ 199{
200 return QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum ); 200 return QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum );
201} 201}
202 202
203KToolBar::KToolBar( QWidget *parent, const char *name, bool honorStyle, bool readConfig ) 203KToolBar::KToolBar( QWidget *parent, const char *name, bool honorStyle, bool readConfig )
204#ifdef DESKTOP_VERSION 204#ifdef DESKTOP_VERSION
205 : QToolBar( QString::fromLatin1( name ), 205 : QToolBar( QString::fromLatin1( name ),
206 parent && parent->inherits( "QMainWindow" ) ? static_cast<QMainWindow*>(parent) : 0, 206 parent && parent->inherits( "QMainWindow" ) ? static_cast<QMainWindow*>(parent) : 0,
207 parent, FALSE, 207 parent, FALSE,
208 name ? name : "mainToolBar") 208 name ? name : "mainToolBar")
209#else 209#else
210 : QPEToolBar( parent && parent->inherits( "QMainWindow" ) ? static_cast<QMainWindow*>(parent) : 0, 210 : QPEToolBar( parent && parent->inherits( "QMainWindow" ) ? static_cast<QMainWindow*>(parent) : 0,
211 QString::fromLatin1( name )) 211 QString::fromLatin1( name ))
212 212
213 213
214#endif 214#endif
215{ 215{
216 init( readConfig, honorStyle ); 216 init( readConfig, honorStyle );
217} 217}
218 218
219KToolBar::KToolBar( QMainWindow *parentWindow, QMainWindow::ToolBarDock dock, bool newLine, const char *name, bool honorStyle, bool readConfig ) 219KToolBar::KToolBar( QMainWindow *parentWindow, QMainWindow::ToolBarDock dock, bool newLine, const char *name, bool honorStyle, bool readConfig )
220#ifdef DESKTOP_VERSION 220#ifdef DESKTOP_VERSION
221 : QToolBar( QString::fromLatin1( name ), 221 : QToolBar( QString::fromLatin1( name ),
222 parentWindow, dock, newLine, 222 parentWindow, dock, newLine,
223 name ? name : "mainToolBar") 223 name ? name : "mainToolBar")
224#else 224#else
225 : QPEToolBar( parentWindow,QString::fromLatin1( name )) 225 : QPEToolBar( parentWindow,QString::fromLatin1( name ))
226 226
227 227
228#endif 228#endif
229 229
230{ 230{
231 init( readConfig, honorStyle ); 231 init( readConfig, honorStyle );
232} 232}
233 233
234KToolBar::KToolBar( QMainWindow *parentWindow, QWidget *dock, bool newLine, const char *name, bool honorStyle, bool readConfig ) 234KToolBar::KToolBar( QMainWindow *parentWindow, QWidget *dock, bool newLine, const char *name, bool honorStyle, bool readConfig )
235#ifdef DESKTOP_VERSION 235#ifdef DESKTOP_VERSION
236 : QToolBar( QString::fromLatin1( name ), 236 : QToolBar( QString::fromLatin1( name ),
237 parentWindow, dock, newLine, 237 parentWindow, dock, newLine,
238 name ? name : "mainToolBar") 238 name ? name : "mainToolBar")
239#else 239#else
240 : QPEToolBar( parentWindow,QString::fromLatin1( name )) 240 : QPEToolBar( parentWindow,QString::fromLatin1( name ))
241 241
242 242
243#endif 243#endif
244 244
245{ 245{
246 init( readConfig, honorStyle ); 246 init( readConfig, honorStyle );
247} 247}
248 248
249KToolBar::~KToolBar() 249KToolBar::~KToolBar()
250{ 250{
251 inshutdownprocess = true; 251 inshutdownprocess = true;
252 emit toolbarDestroyed(); 252 emit toolbarDestroyed();
253 delete d; 253 delete d;
254} 254}
255 255
256void KToolBar::init( bool readConfig, bool honorStyle ) 256void KToolBar::init( bool readConfig, bool honorStyle )
257{ 257{
258 sizeHintW = 240;
259 sizeHintH = 22;
258 inshutdownprocess = false; 260 inshutdownprocess = false;
259 d = new KToolBarPrivate; 261 d = new KToolBarPrivate;
260 setFullSize( TRUE ); 262 setFullSize( TRUE );
261 d->m_honorStyle = honorStyle; 263 d->m_honorStyle = honorStyle;
262 context = 0; 264 context = 0;
263 layoutTimer = new QTimer( this ); 265 layoutTimer = new QTimer( this );
264 connect( layoutTimer, SIGNAL( timeout() ), 266 connect( layoutTimer, SIGNAL( timeout() ),
265 this, SLOT( rebuildLayout() ) ); 267 this, SLOT( rebuildLayout() ) );
266 connect( &(d->repaintTimer), SIGNAL( timeout() ), 268 connect( &(d->repaintTimer), SIGNAL( timeout() ),
267 this, SLOT( slotRepaint() ) ); 269 this, SLOT( slotRepaint() ) );
268/*US 270/*US
269 if ( kapp ) { // may be null when started inside designer 271 if ( kapp ) { // may be null when started inside designer
270 connect(kapp, SIGNAL(toolbarAppearanceChanged(int)), this, SLOT(slotAppearanceChanged())); 272 connect(kapp, SIGNAL(toolbarAppearanceChanged(int)), this, SLOT(slotAppearanceChanged()));
271 // request notification of changes in icon style 273 // request notification of changes in icon style
272 kapp->addKipcEventMask(KIPC::IconChanged); 274 kapp->addKipcEventMask(KIPC::IconChanged);
273 connect(kapp, SIGNAL(iconChanged(int)), this, SLOT(slotIconChanged(int))); 275 connect(kapp, SIGNAL(iconChanged(int)), this, SLOT(slotIconChanged(int)));
274 } 276 }
275*/ 277*/
276 // finally, read in our configurable settings 278 // finally, read in our configurable settings
277 if ( readConfig ) 279 if ( readConfig )
278 slotReadConfig(); 280 slotReadConfig();
279 281
280 if ( mainWindow() ) 282 if ( mainWindow() )
281 connect( mainWindow(), SIGNAL( toolBarPositionChanged( QToolBar * ) ), 283 connect( mainWindow(), SIGNAL( toolBarPositionChanged( QToolBar * ) ),
282 this, SLOT( toolBarPosChanged( QToolBar * ) ) ); 284 this, SLOT( toolBarPosChanged( QToolBar * ) ) );
283 285
284 // Hack to make sure we recalculate our size when we dock. 286 // Hack to make sure we recalculate our size when we dock.
285//US connect( this, SIGNAL(placeChanged(QDockWindow::Place)), SLOT(rebuildLayout()) ); 287//US connect( this, SIGNAL(placeChanged(QDockWindow::Place)), SLOT(rebuildLayout()) );
286} 288}
287 289
288int KToolBar::insertButton(const QString& icon, int id, bool enabled, 290int KToolBar::insertButton(const QString& icon, int id, bool enabled,
289 const QString& text, int index/*US, KInstance *_instance*/ ) 291 const QString& text, int index/*US, KInstance *_instance*/ )
290{ 292{
291 KToolBarButton *button = new KToolBarButton( icon, id, this, 0, text/*US, _instance*/ ); 293 KToolBarButton *button = new KToolBarButton( icon, id, this, 0, text/*US, _instance*/ );
292 294
293 insertWidgetInternal( button, index, id ); 295 insertWidgetInternal( button, index, id );
294 button->setEnabled( enabled ); 296 button->setEnabled( enabled );
295 doConnections( button ); 297 doConnections( button );
296 return index; 298 return index;
297} 299}
298 300
299 301
300int KToolBar::insertButton(const QString& icon, int id, const char *signal, 302int KToolBar::insertButton(const QString& icon, int id, const char *signal,
301 const QObject *receiver, const char *slot, 303 const QObject *receiver, const char *slot,
302 bool enabled, const QString& text, int index/*US, KInstance *_instance*/ ) 304 bool enabled, const QString& text, int index/*US, KInstance *_instance*/ )
303{ 305{
304 KToolBarButton *button = new KToolBarButton( icon, id, this, 0, text/*US, _instance*/); 306 KToolBarButton *button = new KToolBarButton( icon, id, this, 0, text/*US, _instance*/);
305 insertWidgetInternal( button, index, id ); 307 insertWidgetInternal( button, index, id );
306 button->setEnabled( enabled ); 308 button->setEnabled( enabled );
307 connect( button, signal, receiver, slot ); 309 connect( button, signal, receiver, slot );
308 doConnections( button ); 310 doConnections( button );
309 return index; 311 return index;
310} 312}
311 313
312 314
313int KToolBar::insertButton(const QPixmap& pixmap, int id, bool enabled, 315int KToolBar::insertButton(const QPixmap& pixmap, int id, bool enabled,
314 const QString& text, int index ) 316 const QString& text, int index )
315{ 317{
316 KToolBarButton *button = new KToolBarButton( pixmap, id, this, 0, text); 318 KToolBarButton *button = new KToolBarButton( pixmap, id, this, 0, text);
317 insertWidgetInternal( button, index, id ); 319 insertWidgetInternal( button, index, id );
318 button->setEnabled( enabled ); 320 button->setEnabled( enabled );
319 doConnections( button ); 321 doConnections( button );
320 return index; 322 return index;
321} 323}
322#if 0 324#if 0
323 bar->insertButton( icon, id_, SIGNAL( clicked() ), this, 325 bar->insertButton( icon, id_, SIGNAL( clicked() ), this,
324 SLOT( slotActivated() ), 326 SLOT( slotActivated() ),
325 d->isEnabled(), d->plainText(), index/*US, instance*/ ); 327 d->isEnabled(), d->plainText(), index/*US, instance*/ );
326#endif 328#endif
327 329
328int KToolBar::insertButton(const QPixmap& pixmap, int id, const char *signal, 330int KToolBar::insertButton(const QPixmap& pixmap, int id, const char *signal,
329 const QObject *receiver, const char *slot, 331 const QObject *receiver, const char *slot,
330 bool enabled, const QString& text, 332 bool enabled, const QString& text,
331 int index ) 333 int index )
332{ 334{
333 KToolBarButton *button = new KToolBarButton( pixmap, id, this, 0, text); 335 KToolBarButton *button = new KToolBarButton( pixmap, id, this, 0, text);
334 insertWidgetInternal( button, index, id ); 336 insertWidgetInternal( button, index, id );
335 button->setEnabled( enabled ); 337 button->setEnabled( enabled );
336 connect( button, signal, receiver, slot ); 338 connect( button, signal, receiver, slot );
337 doConnections( button ); 339 doConnections( button );
338 return index; 340 return index;
339} 341}
340 342
341 343
342int KToolBar::insertButton(const QString& icon, int id, QPopupMenu *popup, 344int KToolBar::insertButton(const QString& icon, int id, QPopupMenu *popup,
343 bool enabled, const QString &text, int index ) 345 bool enabled, const QString &text, int index )
344{ 346{
345 KToolBarButton *button = new KToolBarButton( icon, id, this, 0, text ); 347 KToolBarButton *button = new KToolBarButton( icon, id, this, 0, text );
346 insertWidgetInternal( button, index, id ); 348 insertWidgetInternal( button, index, id );
347 button->setEnabled( enabled ); 349 button->setEnabled( enabled );
348 button->setPopup( popup ); 350 button->setPopup( popup );
349 doConnections( button ); 351 doConnections( button );
350 return index; 352 return index;
351} 353}
352 354
353 355
354int KToolBar::insertButton(const QPixmap& pixmap, int id, QPopupMenu *popup, 356int KToolBar::insertButton(const QPixmap& pixmap, int id, QPopupMenu *popup,
355 bool enabled, const QString &text, int index ) 357 bool enabled, const QString &text, int index )
356{ 358{
357 KToolBarButton *button = new KToolBarButton( pixmap, id, this, 0, text ); 359 KToolBarButton *button = new KToolBarButton( pixmap, id, this, 0, text );
358 insertWidgetInternal( button, index, id ); 360 insertWidgetInternal( button, index, id );
359 button->setEnabled( enabled ); 361 button->setEnabled( enabled );
360 button->setPopup( popup ); 362 button->setPopup( popup );
361 doConnections( button ); 363 doConnections( button );
362 return index; 364 return index;
363} 365}
364 366
365 367
366int KToolBar::insertLined (const QString& text, int id, 368int KToolBar::insertLined (const QString& text, int id,
367 const char *signal, 369 const char *signal,
368 const QObject *receiver, const char *slot, 370 const QObject *receiver, const char *slot,
369 bool enabled , 371 bool enabled ,
370 const QString& toolTipText, 372 const QString& toolTipText,
371 int size, int index ) 373 int size, int index )
372{ 374{
373 KLineEdit *lined = new KLineEdit ( this, 0 ); 375 KLineEdit *lined = new KLineEdit ( this, 0 );
374 if ( !toolTipText.isEmpty() ) 376 if ( !toolTipText.isEmpty() )
375 QToolTip::add( lined, toolTipText ); 377 QToolTip::add( lined, toolTipText );
376 if ( size > 0 ) 378 if ( size > 0 )
377 lined->setMinimumWidth( size ); 379 lined->setMinimumWidth( size );
378 insertWidgetInternal( lined, index, id ); 380 insertWidgetInternal( lined, index, id );
379 connect( lined, signal, receiver, slot ); 381 connect( lined, signal, receiver, slot );
380 lined->setText(text); 382 lined->setText(text);
381 lined->setEnabled( enabled ); 383 lined->setEnabled( enabled );
382 return index; 384 return index;
383} 385}
384 386
385int KToolBar::insertCombo (const QStringList &list, int id, bool writable, 387int KToolBar::insertCombo (const QStringList &list, int id, bool writable,
386 const char *signal, const QObject *receiver, 388 const char *signal, const QObject *receiver,
387 const char *slot, bool enabled, 389 const char *slot, bool enabled,
388 const QString& tooltiptext, 390 const QString& tooltiptext,
389 int size, int index, 391 int size, int index,
390 QComboBox::Policy policy ) 392 QComboBox::Policy policy )
391{ 393{
392//US KComboBox *combo = new KComboBox ( writable, this ); 394//US KComboBox *combo = new KComboBox ( writable, this );
393 KComboBox *combo = new KComboBox ( this ); 395 KComboBox *combo = new KComboBox ( this );
394 combo->setEditable(writable); 396 combo->setEditable(writable);
395 397
396 insertWidgetInternal( combo, index, id ); 398 insertWidgetInternal( combo, index, id );
397 combo->insertStringList (list); 399 combo->insertStringList (list);
398 combo->setInsertionPolicy(policy); 400 combo->setInsertionPolicy(policy);
399 combo->setEnabled( enabled ); 401 combo->setEnabled( enabled );
400 if ( !tooltiptext.isEmpty() ) 402 if ( !tooltiptext.isEmpty() )
401 QToolTip::add( combo, tooltiptext ); 403 QToolTip::add( combo, tooltiptext );
402 if ( size > 0 ) 404 if ( size > 0 )
403 combo->setMinimumWidth( size ); 405 combo->setMinimumWidth( size );
404 if (!tooltiptext.isNull()) 406 if (!tooltiptext.isNull())
405 QToolTip::add( combo, tooltiptext ); 407 QToolTip::add( combo, tooltiptext );
406 408
407 if ( signal && receiver && slot ) 409 if ( signal && receiver && slot )
408 connect ( combo, signal, receiver, slot ); 410 connect ( combo, signal, receiver, slot );
409 return index; 411 return index;
410} 412}
411 413
412 414
413int KToolBar::insertCombo (const QString& text, int id, bool writable, 415int KToolBar::insertCombo (const QString& text, int id, bool writable,
414 const char *signal, QObject *receiver, 416 const char *signal, QObject *receiver,
415 const char *slot, bool enabled, 417 const char *slot, bool enabled,
416 const QString& tooltiptext, 418 const QString& tooltiptext,
417 int size, int index, 419 int size, int index,
418 QComboBox::Policy policy ) 420 QComboBox::Policy policy )
419{ 421{
420//US KComboBox *combo = new KComboBox ( writable, this ); 422//US KComboBox *combo = new KComboBox ( writable, this );
421 KComboBox *combo = new KComboBox ( this ); 423 KComboBox *combo = new KComboBox ( this );
422 combo->setEditable(writable); 424 combo->setEditable(writable);
423 425
424 insertWidgetInternal( combo, index, id ); 426 insertWidgetInternal( combo, index, id );
425 combo->insertItem (text); 427 combo->insertItem (text);
426 combo->setInsertionPolicy(policy); 428 combo->setInsertionPolicy(policy);
427 combo->setEnabled( enabled ); 429 combo->setEnabled( enabled );
428 if ( !tooltiptext.isEmpty() ) 430 if ( !tooltiptext.isEmpty() )
429 QToolTip::add( combo, tooltiptext ); 431 QToolTip::add( combo, tooltiptext );
430 if ( size > 0 ) 432 if ( size > 0 )
431 combo->setMinimumWidth( size ); 433 combo->setMinimumWidth( size );
432 if (!tooltiptext.isNull()) 434 if (!tooltiptext.isNull())
433 QToolTip::add( combo, tooltiptext ); 435 QToolTip::add( combo, tooltiptext );
434 connect (combo, signal, receiver, slot); 436 connect (combo, signal, receiver, slot);
435 return index; 437 return index;
436} 438}
437 439
438int KToolBar::insertSeparator(int index, int id) 440int KToolBar::insertSeparator(int index, int id)
439{ 441{
440 QWidget *w = new KToolBarSeparator( orientation(), FALSE, this, "tool bar separator" ); 442 QWidget *w = new KToolBarSeparator( orientation(), FALSE, this, "tool bar separator" );
441 insertWidgetInternal( w, index, id ); 443 insertWidgetInternal( w, index, id );
442 return index; 444 return index;
443} 445}
444 446
445int KToolBar::insertLineSeparator(int index, int id) 447int KToolBar::insertLineSeparator(int index, int id)
446{ 448{
447 QWidget *w = new KToolBarSeparator( orientation(), TRUE, this, "tool bar separator" ); 449 QWidget *w = new KToolBarSeparator( orientation(), TRUE, this, "tool bar separator" );
448 insertWidgetInternal( w, index, id ); 450 insertWidgetInternal( w, index, id );
449 return index; 451 return index;
450} 452}
451 453
452 454
453int KToolBar::insertWidget(int id, int /*width*/, QWidget *widget, int index) 455int KToolBar::insertWidget(int id, int /*width*/, QWidget *widget, int index)
454{ 456{
455 // removeWidgetInternal( widget ); // in case we already have it ? 457 // removeWidgetInternal( widget ); // in case we already have it ?
456 insertWidgetInternal( widget, index, id ); 458 insertWidgetInternal( widget, index, id );
457 return index; 459 return index;
458} 460}
459/*US 461/*US
460int KToolBar::insertAnimatedWidget(int id, QObject *receiver, const char *slot, 462int KToolBar::insertAnimatedWidget(int id, QObject *receiver, const char *slot,
461 const QString& icons, int index ) 463 const QString& icons, int index )
462{ 464{
463 KAnimWidget *anim = new KAnimWidget( icons, d->m_iconSize, this ); 465 KAnimWidget *anim = new KAnimWidget( icons, d->m_iconSize, this );
464 insertWidgetInternal( anim, index, id ); 466 insertWidgetInternal( anim, index, id );
465 467
466 if ( receiver ) 468 if ( receiver )
467 connect( anim, SIGNAL(clicked()), receiver, slot); 469 connect( anim, SIGNAL(clicked()), receiver, slot);
468 470
469 return index; 471 return index;
470} 472}
471 473
472KAnimWidget *KToolBar::animatedWidget( int id ) 474KAnimWidget *KToolBar::animatedWidget( int id )
473{ 475{
474 Id2WidgetMap::Iterator it = id2widget.find( id ); 476 Id2WidgetMap::Iterator it = id2widget.find( id );
475 if ( it == id2widget.end() ) 477 if ( it == id2widget.end() )
476 return 0; 478 return 0;
477 if ( (*it) && (*it)->inherits( "KAnimWidget" ) ) 479 if ( (*it) && (*it)->inherits( "KAnimWidget" ) )
478 return (KAnimWidget*)(*it); 480 return (KAnimWidget*)(*it);
479 QObjectList *l = queryList( "KAnimWidget" ); 481 QObjectList *l = queryList( "KAnimWidget" );
480 if ( !l || !l->first() ) { 482 if ( !l || !l->first() ) {
481 delete l; 483 delete l;
482 return 0; 484 return 0;
483 } 485 }
484 486
485 for ( QObject *o = l->first(); o; o = l->next() ) { 487 for ( QObject *o = l->first(); o; o = l->next() ) {
486 if ( o->inherits( "KAnimWidget" ) ) 488 if ( o->inherits( "KAnimWidget" ) )
487 { 489 {
488 delete l; 490 delete l;
489 return (KAnimWidget*)o; 491 return (KAnimWidget*)o;
490 } 492 }
491 } 493 }
492 494
493 delete l; 495 delete l;
494 return 0; 496 return 0;
495} 497}
496*/ 498*/
497 499
498void KToolBar::addConnection (int id, const char *signal, 500void KToolBar::addConnection (int id, const char *signal,
499 const QObject *receiver, const char *slot) 501 const QObject *receiver, const char *slot)
500{ 502{
501 Id2WidgetMap::Iterator it = id2widget.find( id ); 503 Id2WidgetMap::Iterator it = id2widget.find( id );
502 if ( it == id2widget.end() ) 504 if ( it == id2widget.end() )
503 return; 505 return;
504 if ( (*it) ) 506 if ( (*it) )
505 connect( (*it), signal, receiver, slot ); 507 connect( (*it), signal, receiver, slot );
506} 508}
507 509
508void KToolBar::setItemEnabled( int id, bool enabled ) 510void KToolBar::setItemEnabled( int id, bool enabled )
509{ 511{
510 Id2WidgetMap::Iterator it = id2widget.find( id ); 512 Id2WidgetMap::Iterator it = id2widget.find( id );
511 if ( it == id2widget.end() ) 513 if ( it == id2widget.end() )
512 return; 514 return;
513 if ( (*it) ) 515 if ( (*it) )
514 (*it)->setEnabled( enabled ); 516 (*it)->setEnabled( enabled );
515} 517}
516 518
517 519
518void KToolBar::setButtonPixmap( int id, const QPixmap& _pixmap ) 520void KToolBar::setButtonPixmap( int id, const QPixmap& _pixmap )
519{ 521{
520 Id2WidgetMap::Iterator it = id2widget.find( id ); 522 Id2WidgetMap::Iterator it = id2widget.find( id );
521 if ( it == id2widget.end() ) 523 if ( it == id2widget.end() )
522 return; 524 return;
523//US KToolBarButton * button = dynamic_cast<KToolBarButton *>( *it ); 525//US KToolBarButton * button = dynamic_cast<KToolBarButton *>( *it );
524 KToolBarButton * button = (KToolBarButton *)( *it ); 526 KToolBarButton * button = (KToolBarButton *)( *it );
525 if ( button ) 527 if ( button )
526 button->setPixmap( _pixmap ); 528 button->setPixmap( _pixmap );
527} 529}
528 530
529 531
530void KToolBar::setButtonIcon( int id, const QString& _icon ) 532void KToolBar::setButtonIcon( int id, const QString& _icon )
531{ 533{
532 Id2WidgetMap::Iterator it = id2widget.find( id ); 534 Id2WidgetMap::Iterator it = id2widget.find( id );
533 if ( it == id2widget.end() ) 535 if ( it == id2widget.end() )
534 return; 536 return;
535//US KToolBarButton * button = dynamic_cast<KToolBarButton *>( *it ); 537//US KToolBarButton * button = dynamic_cast<KToolBarButton *>( *it );
536 KToolBarButton * button = (KToolBarButton *)( *it ); 538 KToolBarButton * button = (KToolBarButton *)( *it );
537 if ( button ) 539 if ( button )
538 button->setIcon( _icon ); 540 button->setIcon( _icon );
539} 541}
540 542
541void KToolBar::setButtonIconSet( int id, const QIconSet& iconset ) 543void KToolBar::setButtonIconSet( int id, const QIconSet& iconset )
542{ 544{
543 Id2WidgetMap::Iterator it = id2widget.find( id ); 545 Id2WidgetMap::Iterator it = id2widget.find( id );
544 if ( it == id2widget.end() ) 546 if ( it == id2widget.end() )
545 return; 547 return;
546//US KToolBarButton * button = dynamic_cast<KToolBarButton *>( *it ); 548//US KToolBarButton * button = dynamic_cast<KToolBarButton *>( *it );
547 KToolBarButton * button = (KToolBarButton *)( *it ); 549 KToolBarButton * button = (KToolBarButton *)( *it );
548 if ( button ) 550 if ( button )
549 button->setIconSet( iconset ); 551 button->setIconSet( iconset );
550} 552}
551 553
552 554
553void KToolBar::setDelayedPopup (int id , QPopupMenu *_popup, bool toggle ) 555void KToolBar::setDelayedPopup (int id , QPopupMenu *_popup, bool toggle )
554{ 556{
555 Id2WidgetMap::Iterator it = id2widget.find( id ); 557 Id2WidgetMap::Iterator it = id2widget.find( id );
556 if ( it == id2widget.end() ) 558 if ( it == id2widget.end() )
557 return; 559 return;
558//US KToolBarButton * button = dynamic_cast<KToolBarButton *>( *it ); 560//US KToolBarButton * button = dynamic_cast<KToolBarButton *>( *it );
559 KToolBarButton * button = (KToolBarButton *)( *it ); 561 KToolBarButton * button = (KToolBarButton *)( *it );
560 if ( button ) 562 if ( button )
561 button->setDelayedPopup( _popup, toggle ); 563 button->setDelayedPopup( _popup, toggle );
562} 564}
563 565
564 566
565void KToolBar::setAutoRepeat (int id, bool flag) 567void KToolBar::setAutoRepeat (int id, bool flag)
566{ 568{
567 Id2WidgetMap::Iterator it = id2widget.find( id ); 569 Id2WidgetMap::Iterator it = id2widget.find( id );
568 if ( it == id2widget.end() ) 570 if ( it == id2widget.end() )
569 return; 571 return;
570//US KToolBarButton * button = dynamic_cast<KToolBarButton *>( *it ); 572//US KToolBarButton * button = dynamic_cast<KToolBarButton *>( *it );
571 KToolBarButton * button = (KToolBarButton *)( *it ); 573 KToolBarButton * button = (KToolBarButton *)( *it );
572 if ( button ) 574 if ( button )
573 button->setAutoRepeat( flag ); 575 button->setAutoRepeat( flag );
574} 576}
575 577
576 578
577void KToolBar::setToggle (int id, bool flag ) 579void KToolBar::setToggle (int id, bool flag )
578{ 580{
579 Id2WidgetMap::Iterator it = id2widget.find( id ); 581 Id2WidgetMap::Iterator it = id2widget.find( id );
580 if ( it == id2widget.end() ) 582 if ( it == id2widget.end() )
581 return; 583 return;
582//US KToolBarButton * button = dynamic_cast<KToolBarButton *>( *it ); 584//US KToolBarButton * button = dynamic_cast<KToolBarButton *>( *it );
583 KToolBarButton * button = (KToolBarButton *)( *it ); 585 KToolBarButton * button = (KToolBarButton *)( *it );
584 if ( button ) 586 if ( button )
585 button->setToggle( flag ); 587 button->setToggle( flag );
586} 588}
587 589
588 590
589void KToolBar::toggleButton (int id) 591void KToolBar::toggleButton (int id)
590{ 592{
591 Id2WidgetMap::Iterator it = id2widget.find( id ); 593 Id2WidgetMap::Iterator it = id2widget.find( id );
592 if ( it == id2widget.end() ) 594 if ( it == id2widget.end() )
593 return; 595 return;
594//US KToolBarButton * button = dynamic_cast<KToolBarButton *>( *it ); 596//US KToolBarButton * button = dynamic_cast<KToolBarButton *>( *it );
595 KToolBarButton * button = (KToolBarButton *)( *it ); 597 KToolBarButton * button = (KToolBarButton *)( *it );
596 if ( button ) 598 if ( button )
597 button->toggle(); 599 button->toggle();
598} 600}
599 601
600 602
601void KToolBar::setButton (int id, bool flag) 603void KToolBar::setButton (int id, bool flag)
602{ 604{
603 Id2WidgetMap::Iterator it = id2widget.find( id ); 605 Id2WidgetMap::Iterator it = id2widget.find( id );
604 if ( it == id2widget.end() ) 606 if ( it == id2widget.end() )
605 return; 607 return;
606//US KToolBarButton * button = dynamic_cast<KToolBarButton *>( *it ); 608//US KToolBarButton * button = dynamic_cast<KToolBarButton *>( *it );
607 KToolBarButton * button = (KToolBarButton *)( *it ); 609 KToolBarButton * button = (KToolBarButton *)( *it );
608 if ( button ) 610 if ( button )
609 button->on( flag ); 611 button->on( flag );
610} 612}
611 613
612 614
613bool KToolBar::isButtonOn (int id) const 615bool KToolBar::isButtonOn (int id) const
614{ 616{
615 Id2WidgetMap::ConstIterator it = id2widget.find( id ); 617 Id2WidgetMap::ConstIterator it = id2widget.find( id );
616 if ( it == id2widget.end() ) 618 if ( it == id2widget.end() )
617 return false; 619 return false;
618//US KToolBarButton * button = dynamic_cast<KToolBarButton *>( *it ); 620//US KToolBarButton * button = dynamic_cast<KToolBarButton *>( *it );
619 KToolBarButton * button = (KToolBarButton *)( *it ); 621 KToolBarButton * button = (KToolBarButton *)( *it );
620 return button ? button->isOn() : false; 622 return button ? button->isOn() : false;
621} 623}
622 624
623 625
624void KToolBar::setLinedText (int id, const QString& text) 626void KToolBar::setLinedText (int id, const QString& text)
625{ 627{
626 Id2WidgetMap::Iterator it = id2widget.find( id ); 628 Id2WidgetMap::Iterator it = id2widget.find( id );
627 if ( it == id2widget.end() ) 629 if ( it == id2widget.end() )
628 return; 630 return;
629//US QLineEdit * lineEdit = dynamic_cast<QLineEdit *>( *it ); 631//US QLineEdit * lineEdit = dynamic_cast<QLineEdit *>( *it );
630 QLineEdit * lineEdit = (QLineEdit *)( *it ); 632 QLineEdit * lineEdit = (QLineEdit *)( *it );
631 if ( lineEdit ) 633 if ( lineEdit )
632 lineEdit->setText( text ); 634 lineEdit->setText( text );
633} 635}
634 636
635 637
636QString KToolBar::getLinedText (int id) const 638QString KToolBar::getLinedText (int id) const
637{ 639{
638 Id2WidgetMap::ConstIterator it = id2widget.find( id ); 640 Id2WidgetMap::ConstIterator it = id2widget.find( id );
639 if ( it == id2widget.end() ) 641 if ( it == id2widget.end() )
640 return QString::null; 642 return QString::null;
641//US QLineEdit * lineEdit = dynamic_cast<QLineEdit *>( *it ); 643//US QLineEdit * lineEdit = dynamic_cast<QLineEdit *>( *it );
642 QLineEdit * lineEdit = (QLineEdit *)( *it ); 644 QLineEdit * lineEdit = (QLineEdit *)( *it );
643 return lineEdit ? lineEdit->text() : QString::null; 645 return lineEdit ? lineEdit->text() : QString::null;
644} 646}
645 647
646 648
647void KToolBar::insertComboItem (int id, const QString& text, int index) 649void KToolBar::insertComboItem (int id, const QString& text, int index)
648{ 650{
649 Id2WidgetMap::Iterator it = id2widget.find( id ); 651 Id2WidgetMap::Iterator it = id2widget.find( id );
650 if ( it == id2widget.end() ) 652 if ( it == id2widget.end() )
651 return; 653 return;
652//US QComboBox * comboBox = dynamic_cast<QComboBox *>( *it ); 654//US QComboBox * comboBox = dynamic_cast<QComboBox *>( *it );
653 QComboBox * comboBox = (QComboBox *)( *it ); 655 QComboBox * comboBox = (QComboBox *)( *it );
654 if (comboBox) 656 if (comboBox)
655 comboBox->insertItem( text, index ); 657 comboBox->insertItem( text, index );
656} 658}
657 659
658void KToolBar::insertComboList (int id, const QStringList &list, int index) 660void KToolBar::insertComboList (int id, const QStringList &list, int index)
659{ 661{
660 Id2WidgetMap::Iterator it = id2widget.find( id ); 662 Id2WidgetMap::Iterator it = id2widget.find( id );
661 if ( it == id2widget.end() ) 663 if ( it == id2widget.end() )
662 return; 664 return;
663//US QComboBox * comboBox = dynamic_cast<QComboBox *>( *it ); 665//US QComboBox * comboBox = dynamic_cast<QComboBox *>( *it );
664 QComboBox * comboBox = (QComboBox *)( *it ); 666 QComboBox * comboBox = (QComboBox *)( *it );
665 if (comboBox) 667 if (comboBox)
666 comboBox->insertStringList( list, index ); 668 comboBox->insertStringList( list, index );
667} 669}
668 670
669 671
670void KToolBar::removeComboItem (int id, int index) 672void KToolBar::removeComboItem (int id, int index)
671{ 673{
672 Id2WidgetMap::Iterator it = id2widget.find( id ); 674 Id2WidgetMap::Iterator it = id2widget.find( id );
673 if ( it == id2widget.end() ) 675 if ( it == id2widget.end() )
674 return; 676 return;
675//US QComboBox * comboBox = dynamic_cast<QComboBox *>( *it ); 677//US QComboBox * comboBox = dynamic_cast<QComboBox *>( *it );
676 QComboBox * comboBox = (QComboBox *)( *it ); 678 QComboBox * comboBox = (QComboBox *)( *it );
677 if (comboBox) 679 if (comboBox)
678 comboBox->removeItem( index ); 680 comboBox->removeItem( index );
679} 681}
680 682
681 683
682void KToolBar::setCurrentComboItem (int id, int index) 684void KToolBar::setCurrentComboItem (int id, int index)
683{ 685{
684 Id2WidgetMap::Iterator it = id2widget.find( id ); 686 Id2WidgetMap::Iterator it = id2widget.find( id );
685 if ( it == id2widget.end() ) 687 if ( it == id2widget.end() )
686 return; 688 return;
687//US QComboBox * comboBox = dynamic_cast<QComboBox *>( *it ); 689//US QComboBox * comboBox = dynamic_cast<QComboBox *>( *it );
688 QComboBox * comboBox = (QComboBox *)( *it ); 690 QComboBox * comboBox = (QComboBox *)( *it );
689 if (comboBox) 691 if (comboBox)
690 comboBox->setCurrentItem( index ); 692 comboBox->setCurrentItem( index );
691} 693}
692 694
693 695
694void KToolBar::changeComboItem (int id, const QString& text, int index) 696void KToolBar::changeComboItem (int id, const QString& text, int index)
695{ 697{
696 Id2WidgetMap::Iterator it = id2widget.find( id ); 698 Id2WidgetMap::Iterator it = id2widget.find( id );
697 if ( it == id2widget.end() ) 699 if ( it == id2widget.end() )
698 return; 700 return;
699//US QComboBox * comboBox = dynamic_cast<QComboBox *>( *it ); 701//US QComboBox * comboBox = dynamic_cast<QComboBox *>( *it );
700 QComboBox * comboBox = (QComboBox *)( *it ); 702 QComboBox * comboBox = (QComboBox *)( *it );
701 if (comboBox) 703 if (comboBox)
702 comboBox->changeItem( text, index ); 704 comboBox->changeItem( text, index );
703} 705}
704 706
705 707
706void KToolBar::clearCombo (int id) 708void KToolBar::clearCombo (int id)
707{ 709{
708 Id2WidgetMap::Iterator it = id2widget.find( id ); 710 Id2WidgetMap::Iterator it = id2widget.find( id );
709 if ( it == id2widget.end() ) 711 if ( it == id2widget.end() )
710 return; 712 return;
711//US QComboBox * comboBox = dynamic_cast<QComboBox *>( *it ); 713//US QComboBox * comboBox = dynamic_cast<QComboBox *>( *it );
712 QComboBox * comboBox = (QComboBox *)( *it ); 714 QComboBox * comboBox = (QComboBox *)( *it );
713 if (comboBox) 715 if (comboBox)
714 comboBox->clear(); 716 comboBox->clear();
715} 717}
716 718
717 719
718QString KToolBar::getComboItem (int id, int index) const 720QString KToolBar::getComboItem (int id, int index) const
719{ 721{
720 Id2WidgetMap::ConstIterator it = id2widget.find( id ); 722 Id2WidgetMap::ConstIterator it = id2widget.find( id );
721 if ( it == id2widget.end() ) 723 if ( it == id2widget.end() )
722 return QString::null; 724 return QString::null;
723//US QComboBox * comboBox = dynamic_cast<QComboBox *>( *it ); 725//US QComboBox * comboBox = dynamic_cast<QComboBox *>( *it );
724 QComboBox * comboBox = (QComboBox *)( *it ); 726 QComboBox * comboBox = (QComboBox *)( *it );
725 return comboBox ? comboBox->text( index ) : QString::null; 727 return comboBox ? comboBox->text( index ) : QString::null;
726} 728}
727 729
728 730
729KComboBox * KToolBar::getCombo(int id) 731KComboBox * KToolBar::getCombo(int id)
730{ 732{
731 Id2WidgetMap::Iterator it = id2widget.find( id ); 733 Id2WidgetMap::Iterator it = id2widget.find( id );
732 if ( it == id2widget.end() ) 734 if ( it == id2widget.end() )
733 return 0; 735 return 0;
734//US return dynamic_cast<KComboBox *>( *it ); 736//US return dynamic_cast<KComboBox *>( *it );
735 return (KComboBox *)( *it ); 737 return (KComboBox *)( *it );
736} 738}
737 739
738 740
739KLineEdit * KToolBar::getLined (int id) 741KLineEdit * KToolBar::getLined (int id)
740{ 742{
741 Id2WidgetMap::Iterator it = id2widget.find( id ); 743 Id2WidgetMap::Iterator it = id2widget.find( id );
742 if ( it == id2widget.end() ) 744 if ( it == id2widget.end() )
743 return 0; 745 return 0;
744//US return dynamic_cast<KLineEdit *>( *it ); 746//US return dynamic_cast<KLineEdit *>( *it );
745 return (KLineEdit *)( *it ); 747 return (KLineEdit *)( *it );
746} 748}
747 749
748 750
749KToolBarButton * KToolBar::getButton (int id) 751KToolBarButton * KToolBar::getButton (int id)
750{ 752{
751 Id2WidgetMap::Iterator it = id2widget.find( id ); 753 Id2WidgetMap::Iterator it = id2widget.find( id );
752 if ( it == id2widget.end() ) 754 if ( it == id2widget.end() )
753 return 0; 755 return 0;
754//US return dynamic_cast<KToolBarButton *>( *it ); 756//US return dynamic_cast<KToolBarButton *>( *it );
755 return (KToolBarButton *)( *it ); 757 return (KToolBarButton *)( *it );
756} 758}
757 759
758 760
759void KToolBar::alignItemRight (int id, bool right ) 761void KToolBar::alignItemRight (int id, bool right )
760{ 762{
761 Id2WidgetMap::Iterator it = id2widget.find( id ); 763 Id2WidgetMap::Iterator it = id2widget.find( id );
762 if ( it == id2widget.end() ) 764 if ( it == id2widget.end() )
763 return; 765 return;
764 if ( rightAligned && !right && (*it) == rightAligned ) 766 if ( rightAligned && !right && (*it) == rightAligned )
765 rightAligned = 0; 767 rightAligned = 0;
766 if ( (*it) && right ) 768 if ( (*it) && right )
767 rightAligned = (*it); 769 rightAligned = (*it);
768} 770}
769 771
770 772
771QWidget *KToolBar::getWidget (int id) 773QWidget *KToolBar::getWidget (int id)
772{ 774{
773 Id2WidgetMap::Iterator it = id2widget.find( id ); 775 Id2WidgetMap::Iterator it = id2widget.find( id );
774 return ( it == id2widget.end() ) ? 0 : (*it); 776 return ( it == id2widget.end() ) ? 0 : (*it);
775} 777}
776 778
777 779
778void KToolBar::setItemAutoSized (int id, bool yes ) 780void KToolBar::setItemAutoSized (int id, bool yes )
779{ 781{
780 QWidget *w = getWidget(id); 782 QWidget *w = getWidget(id);
781 if ( w && yes ) 783 if ( w && yes )
782 setStretchableWidget( w ); 784 setStretchableWidget( w );
783} 785}
784 786
785 787
786void KToolBar::clear () 788void KToolBar::clear ()
787{ 789{
788 QToolBar::clear(); 790 QToolBar::clear();
789 widget2id.clear(); 791 widget2id.clear();
790 id2widget.clear(); 792 id2widget.clear();
791} 793}
792 794
793 795
794void KToolBar::removeItem(int id) 796void KToolBar::removeItem(int id)
795{ 797{
796 Id2WidgetMap::Iterator it = id2widget.find( id ); 798 Id2WidgetMap::Iterator it = id2widget.find( id );
797 if ( it == id2widget.end() ) 799 if ( it == id2widget.end() )
798 { 800 {
799 kdDebug(220) << "KToolBar::removeItem item " << id << " not found" << endl; 801 kdDebug(220) << "KToolBar::removeItem item " << id << " not found" << endl;
800 return; 802 return;
801 } 803 }
802 QWidget * w = (*it); 804 QWidget * w = (*it);
803 id2widget.remove( id ); 805 id2widget.remove( id );
804 widget2id.remove( w ); 806 widget2id.remove( w );
805 widgets.removeRef( w ); 807 widgets.removeRef( w );
806 delete w; 808 delete w;
807} 809}
808 810
809 811
810void KToolBar::removeItemDelayed(int id) 812void KToolBar::removeItemDelayed(int id)
811{ 813{
812 Id2WidgetMap::Iterator it = id2widget.find( id ); 814 Id2WidgetMap::Iterator it = id2widget.find( id );
813 if ( it == id2widget.end() ) 815 if ( it == id2widget.end() )
814 { 816 {
815 kdDebug(220) << "KToolBar::removeItem item " << id << " not found" << endl; 817 kdDebug(220) << "KToolBar::removeItem item " << id << " not found" << endl;
816 return; 818 return;
817 } 819 }
818 QWidget * w = (*it); 820 QWidget * w = (*it);
819 id2widget.remove( id ); 821 id2widget.remove( id );
820 widget2id.remove( w ); 822 widget2id.remove( w );
821 widgets.removeRef( w ); 823 widgets.removeRef( w );
822 824
823 w->blockSignals(true); 825 w->blockSignals(true);
824 d->idleButtons.append(w); 826 d->idleButtons.append(w);
825 layoutTimer->start( 50, TRUE ); 827 layoutTimer->start( 50, TRUE );
826} 828}
827 829
828 830
829void KToolBar::hideItem (int id) 831void KToolBar::hideItem (int id)
830{ 832{
831 QWidget *w = getWidget(id); 833 QWidget *w = getWidget(id);
832 if ( w ) 834 if ( w )
833 w->hide(); 835 w->hide();
834} 836}
835 837
836 838
837void KToolBar::showItem (int id) 839void KToolBar::showItem (int id)
838{ 840{
839 QWidget *w = getWidget(id); 841 QWidget *w = getWidget(id);
840 if ( w ) 842 if ( w )
841 w->show(); 843 w->show();
842} 844}
843 845
844 846
845int KToolBar::itemIndex (int id) 847int KToolBar::itemIndex (int id)
846{ 848{
847 QWidget *w = getWidget(id); 849 QWidget *w = getWidget(id);
848 return w ? widgets.findRef(w) : -1; 850 return w ? widgets.findRef(w) : -1;
849} 851}
850 852
851 853
852void KToolBar::setFullSize(bool flag ) 854void KToolBar::setFullSize(bool flag )
853{ 855{
854 setHorizontalStretchable( flag ); 856 setHorizontalStretchable( flag );
855 setVerticalStretchable( flag ); 857 setVerticalStretchable( flag );
856} 858}
857 859
858 860
859bool KToolBar::fullSize() const 861bool KToolBar::fullSize() const
860{ 862{
861 return isHorizontalStretchable() || isVerticalStretchable(); 863 return isHorizontalStretchable() || isVerticalStretchable();
862} 864}
863 865
864 866
865void KToolBar::enableMoving(bool flag ) 867void KToolBar::enableMoving(bool flag )
866{ 868{
867//US setMovingEnabled(flag); 869//US setMovingEnabled(flag);
868 this->mainWindow()->setToolBarsMovable(flag); 870 this->mainWindow()->setToolBarsMovable(flag);
869} 871}
870 872
871 873
872void KToolBar::setBarPos (BarPosition bpos) 874void KToolBar::setBarPos (BarPosition bpos)
873{ 875{
874 if ( !mainWindow() ) 876 if ( !mainWindow() )
875 return; 877 return;
876//US mainWindow()->moveDockWindow( this, (Dock)bpos ); 878//US mainWindow()->moveDockWindow( this, (Dock)bpos );
877 mainWindow()->moveToolBar( this, (QMainWindow::ToolBarDock)bpos ); 879 mainWindow()->moveToolBar( this, (QMainWindow::ToolBarDock)bpos );
878} 880}
879 881
880 882
881const KToolBar::BarPosition KToolBar::barPos() 883const KToolBar::BarPosition KToolBar::barPos()
882{ 884{
883 if ( !(QMainWindow*)mainWindow() ) 885 if ( !(QMainWindow*)mainWindow() )
884 return KToolBar::Top; 886 return KToolBar::Top;
885//US Dock dock; 887//US Dock dock;
886 QMainWindow::ToolBarDock dock; 888 QMainWindow::ToolBarDock dock;
887 int dm1, dm2; 889 int dm1, dm2;
888 bool dm3; 890 bool dm3;
889 ((QMainWindow*)mainWindow())->getLocation( (QToolBar*)this, dock, dm1, dm3, dm2 ); 891 ((QMainWindow*)mainWindow())->getLocation( (QToolBar*)this, dock, dm1, dm3, dm2 );
890//US if ( dock == DockUnmanaged ) { 892//US if ( dock == DockUnmanaged ) {
891 if ( dock == QMainWindow::Unmanaged ) { 893 if ( dock == QMainWindow::Unmanaged ) {
892 return (KToolBar::BarPosition)Top; 894 return (KToolBar::BarPosition)Top;
893 } 895 }
894 return (BarPosition)dock; 896 return (BarPosition)dock;
895} 897}
896 898
897 899
898bool KToolBar::enable(BarStatus stat) 900bool KToolBar::enable(BarStatus stat)
899{ 901{
900 bool mystat = isVisible(); 902 bool mystat = isVisible();
901 903
902 if ( (stat == Toggle && mystat) || stat == Hide ) 904 if ( (stat == Toggle && mystat) || stat == Hide )
903 hide(); 905 hide();
904 else 906 else
905 show(); 907 show();
906 908
907 return isVisible() == mystat; 909 return isVisible() == mystat;
908} 910}
909 911
910 912
911void KToolBar::setMaxHeight ( int h ) 913void KToolBar::setMaxHeight ( int h )
912{ 914{
913 setMaximumHeight( h ); 915 setMaximumHeight( h );
914} 916}
915 917
916int KToolBar::maxHeight() 918int KToolBar::maxHeight()
917{ 919{
918 return maximumHeight(); 920 return maximumHeight();
919} 921}
920 922
921 923
922void KToolBar::setMaxWidth (int dw) 924void KToolBar::setMaxWidth (int dw)
923{ 925{
924 setMaximumWidth( dw ); 926 setMaximumWidth( dw );
925} 927}
926 928
927 929
928int KToolBar::maxWidth() 930int KToolBar::maxWidth()
929{ 931{
930 return maximumWidth(); 932 return maximumWidth();
931} 933}
932 934
933 935
934void KToolBar::setTitle (const QString& _title) 936void KToolBar::setTitle (const QString& _title)
935{ 937{
936 setLabel( _title ); 938 setLabel( _title );
937} 939}
938 940
939 941
940void KToolBar::enableFloating (bool ) 942void KToolBar::enableFloating (bool )
941{ 943{
942} 944}
943 945
944 946
945void KToolBar::setIconText(IconText it) 947void KToolBar::setIconText(IconText it)
946{ 948{
947 setIconText( it, true ); 949 setIconText( it, true );
948} 950}
949 951
950 952
951void KToolBar::setIconText(IconText icontext, bool update) 953void KToolBar::setIconText(IconText icontext, bool update)
952{ 954{
953 bool doUpdate=false; 955 bool doUpdate=false;
954 956
955 if (icontext != d->m_iconText) { 957 if (icontext != d->m_iconText) {
956 d->m_iconText = icontext; 958 d->m_iconText = icontext;
957 doUpdate=true; 959 doUpdate=true;
958 } 960 }
959 961
960 if (update == false) 962 if (update == false)
961 return; 963 return;
962 964
963 if (doUpdate) 965 if (doUpdate)
964 emit modechange(); // tell buttons what happened 966 emit modechange(); // tell buttons what happened
965 967
966 // ugly hack to force a QMainWindow::triggerLayout( TRUE ) 968 // ugly hack to force a QMainWindow::triggerLayout( TRUE )
967 if ( mainWindow() ) { 969 if ( mainWindow() ) {
968 QMainWindow *mw = mainWindow(); 970 QMainWindow *mw = mainWindow();
969 mw->setUpdatesEnabled( FALSE ); 971 mw->setUpdatesEnabled( FALSE );
970 mw->setToolBarsMovable( !mw->toolBarsMovable() ); 972 mw->setToolBarsMovable( !mw->toolBarsMovable() );
971 mw->setToolBarsMovable( !mw->toolBarsMovable() ); 973 mw->setToolBarsMovable( !mw->toolBarsMovable() );
972 mw->setUpdatesEnabled( TRUE ); 974 mw->setUpdatesEnabled( TRUE );
973 } 975 }
974} 976}
975 977
976 978
977KToolBar::IconText KToolBar::iconText() const 979KToolBar::IconText KToolBar::iconText() const
978{ 980{
979 return d->m_iconText; 981 return d->m_iconText;
980} 982}
981 983
982 984
983void KToolBar::setIconSize(int size) 985void KToolBar::setIconSize(int size)
984{ 986{
985 setIconSize( size, true ); 987 setIconSize( size, true );
986} 988}
987 989
988void KToolBar::setIconSize(int size, bool update) 990void KToolBar::setIconSize(int size, bool update)
989{ 991{
990 bool doUpdate=false; 992 bool doUpdate=false;
991 993
992 if ( size != d->m_iconSize ) { 994 if ( size != d->m_iconSize ) {
993 d->m_iconSize = size; 995 d->m_iconSize = size;
994 doUpdate=true; 996 doUpdate=true;
995 } 997 }
996 998
997 if (update == false) 999 if (update == false)
998 return; 1000 return;
999 1001
1000 if (doUpdate) 1002 if (doUpdate)
1001 emit modechange(); // tell buttons what happened 1003 emit modechange(); // tell buttons what happened
1002 1004
1003 // ugly hack to force a QMainWindow::triggerLayout( TRUE ) 1005 // ugly hack to force a QMainWindow::triggerLayout( TRUE )
1004 if ( mainWindow() ) { 1006 if ( mainWindow() ) {
1005 QMainWindow *mw = mainWindow(); 1007 QMainWindow *mw = mainWindow();
1006 mw->setUpdatesEnabled( FALSE ); 1008 mw->setUpdatesEnabled( FALSE );
1007 mw->setToolBarsMovable( !mw->toolBarsMovable() ); 1009 mw->setToolBarsMovable( !mw->toolBarsMovable() );
1008 mw->setToolBarsMovable( !mw->toolBarsMovable() ); 1010 mw->setToolBarsMovable( !mw->toolBarsMovable() );
1009 mw->setUpdatesEnabled( TRUE ); 1011 mw->setUpdatesEnabled( TRUE );
1010 } 1012 }
1011} 1013}
1012 1014
1013 1015
1014int KToolBar::iconSize() const 1016int KToolBar::iconSize() const
1015{ 1017{
1016/*US 1018/*US
1017 if ( !d->m_iconSize ) // default value? 1019 if ( !d->m_iconSize ) // default value?
1018 { 1020 {
1019 if (!::qstrcmp(QObject::name(), "mainToolBar")) 1021 if (!::qstrcmp(QObject::name(), "mainToolBar"))
1020 return KGlobal::iconLoader()->currentSize(KIcon::MainToolbar); 1022 return KGlobal::iconLoader()->currentSize(KIcon::MainToolbar);
1021 else 1023 else
1022 return KGlobal::iconLoader()->currentSize(KIcon::Toolbar); 1024 return KGlobal::iconLoader()->currentSize(KIcon::Toolbar);
1023 } 1025 }
1024 return d->m_iconSize; 1026 return d->m_iconSize;
1025*/ 1027*/
1026 int ret = 18; 1028 int ret = 18;
1027 if ( QApplication::desktop()->width() > 320 ) 1029 if ( QApplication::desktop()->width() > 320 )
1028 ret = 30; 1030 ret = 30;
1029 return ret; 1031 return ret;
1030} 1032}
1031 1033
1032 1034
1033void KToolBar::setEnableContextMenu(bool enable ) 1035void KToolBar::setEnableContextMenu(bool enable )
1034{ 1036{
1035 d->m_enableContext = enable; 1037 d->m_enableContext = enable;
1036} 1038}
1037 1039
1038 1040
1039bool KToolBar::contextMenuEnabled() const 1041bool KToolBar::contextMenuEnabled() const
1040{ 1042{
1041 return d->m_enableContext; 1043 return d->m_enableContext;
1042} 1044}
1043 1045
1044 1046
1045void KToolBar::setItemNoStyle(int id, bool no_style ) 1047void KToolBar::setItemNoStyle(int id, bool no_style )
1046{ 1048{
1047 Id2WidgetMap::Iterator it = id2widget.find( id ); 1049 Id2WidgetMap::Iterator it = id2widget.find( id );
1048 if ( it == id2widget.end() ) 1050 if ( it == id2widget.end() )
1049 return; 1051 return;
1050//US KToolBarButton * button = dynamic_cast<KToolBarButton *>( *it ); 1052//US KToolBarButton * button = dynamic_cast<KToolBarButton *>( *it );
1051 KToolBarButton * button = (KToolBarButton *)( *it ); 1053 KToolBarButton * button = (KToolBarButton *)( *it );
1052 if (button) 1054 if (button)
1053 button->setNoStyle( no_style ); 1055 button->setNoStyle( no_style );
1054} 1056}
1055 1057
1056 1058
1057void KToolBar::setFlat (bool flag) 1059void KToolBar::setFlat (bool flag)
1058{ 1060{
1059 if ( !mainWindow() ) 1061 if ( !mainWindow() )
1060 return; 1062 return;
1061 if ( flag ) 1063 if ( flag )
1062//US mainWindow()->moveDockWindow( this, DockMinimized ); 1064//US mainWindow()->moveDockWindow( this, DockMinimized );
1063 mainWindow()->moveToolBar( this, QMainWindow::Minimized ); 1065 mainWindow()->moveToolBar( this, QMainWindow::Minimized );
1064 else 1066 else
1065//US mainWindow()->moveDockWindow( this, DockTop ); 1067//US mainWindow()->moveDockWindow( this, DockTop );
1066 mainWindow()->moveToolBar( this, QMainWindow::Top ); 1068 mainWindow()->moveToolBar( this, QMainWindow::Top );
1067 // And remember to save the new look later 1069 // And remember to save the new look later
1068/*US 1070/*US
1069 if ( mainWindow()->inherits( "KMainWindow" ) ) 1071 if ( mainWindow()->inherits( "KMainWindow" ) )
1070 static_cast<KMainWindow *>(mainWindow())->setSettingsDirty(); 1072 static_cast<KMainWindow *>(mainWindow())->setSettingsDirty();
1071*/ 1073*/
1072} 1074}
1073 1075
1074 1076
1075int KToolBar::count() const 1077int KToolBar::count() const
1076{ 1078{
1077 return id2widget.count(); 1079 return id2widget.count();
1078} 1080}
1079 1081
1080 1082
1081void KToolBar::saveState() 1083void KToolBar::saveState()
1082{ 1084{
1083/*US 1085/*US
1084 // first, try to save to the xml file 1086 // first, try to save to the xml file
1085 if ( d->m_xmlguiClient && !d->m_xmlguiClient->xmlFile().isEmpty() ) { 1087 if ( d->m_xmlguiClient && !d->m_xmlguiClient->xmlFile().isEmpty() ) {
1086 // go down one level to get to the right tags 1088 // go down one level to get to the right tags
1087 QDomElement elem = d->m_xmlguiClient->domDocument().documentElement().toElement(); 1089 QDomElement elem = d->m_xmlguiClient->domDocument().documentElement().toElement();
1088 elem = elem.firstChild().toElement(); 1090 elem = elem.firstChild().toElement();
1089 QString barname(!::qstrcmp(name(), "unnamed") ? "mainToolBar" : name()); 1091 QString barname(!::qstrcmp(name(), "unnamed") ? "mainToolBar" : name());
1090 QDomElement current; 1092 QDomElement current;
1091 // now try to find our toolbar 1093 // now try to find our toolbar
1092 d->modified = false; 1094 d->modified = false;
1093 for( ; !elem.isNull(); elem = elem.nextSibling().toElement() ) { 1095 for( ; !elem.isNull(); elem = elem.nextSibling().toElement() ) {
1094 current = elem; 1096 current = elem;
1095 1097
1096 if ( current.tagName().lower() != "toolbar" ) 1098 if ( current.tagName().lower() != "toolbar" )
1097 continue; 1099 continue;
1098 1100
1099 QString curname(current.attribute( "name" )); 1101 QString curname(current.attribute( "name" ));
1100 1102
1101 if ( curname == barname ) { 1103 if ( curname == barname ) {
1102 saveState( current ); 1104 saveState( current );
1103 break; 1105 break;
1104 } 1106 }
1105 } 1107 }
1106 // if we didn't make changes, then just return 1108 // if we didn't make changes, then just return
1107 if ( !d->modified ) 1109 if ( !d->modified )
1108 return; 1110 return;
1109 1111
1110 // now we load in the (non-merged) local file 1112 // now we load in the (non-merged) local file
1111 QString local_xml(KXMLGUIFactory::readConfigFile(d->m_xmlguiClient->xmlFile(), true, d->m_xmlguiClient->instance())); 1113 QString local_xml(KXMLGUIFactory::readConfigFile(d->m_xmlguiClient->xmlFile(), true, d->m_xmlguiClient->instance()));
1112 QDomDocument local; 1114 QDomDocument local;
1113 local.setContent(local_xml); 1115 local.setContent(local_xml);
1114 1116
1115 // make sure we don't append if this toolbar already exists locally 1117 // make sure we don't append if this toolbar already exists locally
1116 bool just_append = true; 1118 bool just_append = true;
1117 elem = local.documentElement().toElement(); 1119 elem = local.documentElement().toElement();
1118 KXMLGUIFactory::removeDOMComments( elem ); 1120 KXMLGUIFactory::removeDOMComments( elem );
1119 elem = elem.firstChild().toElement(); 1121 elem = elem.firstChild().toElement();
1120 for( ; !elem.isNull(); elem = elem.nextSibling().toElement() ) { 1122 for( ; !elem.isNull(); elem = elem.nextSibling().toElement() ) {
1121 if ( elem.tagName().lower() != "toolbar" ) 1123 if ( elem.tagName().lower() != "toolbar" )
1122 continue; 1124 continue;
1123 1125
1124 QString curname(elem.attribute( "name" )); 1126 QString curname(elem.attribute( "name" ));
1125 1127
1126 if ( curname == barname ) { 1128 if ( curname == barname ) {
1127 just_append = false; 1129 just_append = false;
1128 local.documentElement().replaceChild( current, elem ); 1130 local.documentElement().replaceChild( current, elem );
1129 break; 1131 break;
1130 } 1132 }
1131 } 1133 }
1132 1134
1133 if (just_append) 1135 if (just_append)
1134 local.documentElement().appendChild( current ); 1136 local.documentElement().appendChild( current );
1135 1137
1136 KXMLGUIFactory::saveConfigFile(local, d->m_xmlguiClient->localXMLFile(), d->m_xmlguiClient->instance() ); 1138 KXMLGUIFactory::saveConfigFile(local, d->m_xmlguiClient->localXMLFile(), d->m_xmlguiClient->instance() );
1137 1139
1138 return; 1140 return;
1139 } 1141 }
1140*/ 1142*/
1141 // if that didn't work, we save to the config file 1143 // if that didn't work, we save to the config file
1142 KConfig *config = KGlobal::config(); 1144 KConfig *config = KGlobal::config();
1143 saveSettings(config, QString::null); 1145 saveSettings(config, QString::null);
1144 config->sync(); 1146 config->sync();
1145} 1147}
1146 1148
1147QString KToolBar::settingsGroup() 1149QString KToolBar::settingsGroup()
1148{ 1150{
1149 QString configGroup; 1151 QString configGroup;
1150 if (!::qstrcmp(name(), "unnamed") || !::qstrcmp(name(), "mainToolBar")) 1152 if (!::qstrcmp(name(), "unnamed") || !::qstrcmp(name(), "mainToolBar"))
1151 configGroup = "Toolbar style"; 1153 configGroup = "Toolbar style";
1152 else 1154 else
1153 configGroup = QString(name()) + " Toolbar style"; 1155 configGroup = QString(name()) + " Toolbar style";
1154 if ( this->mainWindow() ) 1156 if ( this->mainWindow() )
1155 { 1157 {
1156 configGroup.prepend(" "); 1158 configGroup.prepend(" ");
1157 configGroup.prepend( this->mainWindow()->name() ); 1159 configGroup.prepend( this->mainWindow()->name() );
1158 } 1160 }
1159 return configGroup; 1161 return configGroup;
1160} 1162}
1161 1163
1162void KToolBar::saveSettings(KConfig *config, const QString &_configGroup) 1164void KToolBar::saveSettings(KConfig *config, const QString &_configGroup)
1163{ 1165{
1164 return; 1166 return;
1165 QString configGroup = _configGroup; 1167 QString configGroup = _configGroup;
1166 if (configGroup.isEmpty()) 1168 if (configGroup.isEmpty())
1167 configGroup = settingsGroup(); 1169 configGroup = settingsGroup();
1168 //kdDebug(220) << "KToolBar::saveSettings group=" << _configGroup << " -> " << configGroup << endl; 1170 //kdDebug(220) << "KToolBar::saveSettings group=" << _configGroup << " -> " << configGroup << endl;
1169 1171
1170 QString position, icontext; 1172 QString position, icontext;
1171 int index; 1173 int index;
1172 getAttributes( position, icontext, index ); 1174 getAttributes( position, icontext, index );
1173 1175
1174 //kdDebug(220) << "KToolBar::saveSettings " << name() << " newLine=" << newLine << endl; 1176 //kdDebug(220) << "KToolBar::saveSettings " << name() << " newLine=" << newLine << endl;
1175 1177
1176 KConfigGroupSaver saver(config, configGroup); 1178 KConfigGroupSaver saver(config, configGroup);
1177 1179
1178 if ( position != d->PositionDefault ) 1180 if ( position != d->PositionDefault )
1179 config->writeEntry("Position", position); 1181 config->writeEntry("Position", position);
1180 else 1182 else
1181 config->deleteEntry("Position"); 1183 config->deleteEntry("Position");
1182 1184
1183 if ( icontext != d->IconTextDefault ) 1185 if ( icontext != d->IconTextDefault )
1184 config->writeEntry("IconText", icontext); 1186 config->writeEntry("IconText", icontext);
1185 else 1187 else
1186 config->deleteEntry("IconText"); 1188 config->deleteEntry("IconText");
1187 1189
1188 if ( iconSize() != d->IconSizeDefault ) 1190 if ( iconSize() != d->IconSizeDefault )
1189 config->writeEntry("IconSize", iconSize()); 1191 config->writeEntry("IconSize", iconSize());
1190 else 1192 else
1191 config->deleteEntry("IconSize"); 1193 config->deleteEntry("IconSize");
1192 1194
1193 if ( isHidden() != d->HiddenDefault ) 1195 if ( isHidden() != d->HiddenDefault )
1194 config->writeEntry("Hidden", isHidden()); 1196 config->writeEntry("Hidden", isHidden());
1195 else 1197 else
1196 config->deleteEntry("Hidden"); 1198 config->deleteEntry("Hidden");
1197 1199
1198 if ( index != d->IndexDefault ) 1200 if ( index != d->IndexDefault )
1199 config->writeEntry( "Index", index ); 1201 config->writeEntry( "Index", index );
1200 else 1202 else
1201 config->deleteEntry("Index"); 1203 config->deleteEntry("Index");
1202//US the older version of KDE (used on the Zaurus) has no Offset property 1204//US the older version of KDE (used on the Zaurus) has no Offset property
1203/* if ( offset() != d->OffsetDefault ) 1205/* if ( offset() != d->OffsetDefault )
1204 config->writeEntry( "Offset", offset() ); 1206 config->writeEntry( "Offset", offset() );
1205 else 1207 else
1206*/ 1208*/
1207 config->deleteEntry("Offset"); 1209 config->deleteEntry("Offset");
1208 1210
1209//US the older version of KDE (used on the Zaurus) has no NewLine property 1211//US the older version of KDE (used on the Zaurus) has no NewLine property
1210/* 1212/*
1211 if ( newLine() != d->NewLineDefault ) 1213 if ( newLine() != d->NewLineDefault )
1212 config->writeEntry( "NewLine", newLine() ); 1214 config->writeEntry( "NewLine", newLine() );
1213 else 1215 else
1214*/ 1216*/
1215 config->deleteEntry("NewLine"); 1217 config->deleteEntry("NewLine");
1216} 1218}
1217 1219
1218void KToolBar::setXMLGUIClient( KXMLGUIClient *client ) 1220void KToolBar::setXMLGUIClient( KXMLGUIClient *client )
1219{ 1221{
1220 d->m_xmlguiClient = client; 1222 d->m_xmlguiClient = client;
1221} 1223}
1222 1224
1223void KToolBar::setText( const QString & txt ) 1225void KToolBar::setText( const QString & txt )
1224{ 1226{
1225//US setLabel( txt + " ( " + kapp->caption() + " ) " ); 1227//US setLabel( txt + " ( " + kapp->caption() + " ) " );
1226 setLabel( txt + " ( " + KGlobal::getAppName() + " ) " ); 1228 setLabel( txt + " ( " + KGlobal::getAppName() + " ) " );
1227} 1229}
1228 1230
1229 1231
1230QString KToolBar::text() const 1232QString KToolBar::text() const
1231{ 1233{
1232 return label(); 1234 return label();
1233} 1235}
1234 1236
1235 1237
1236void KToolBar::doConnections( KToolBarButton *button ) 1238void KToolBar::doConnections( KToolBarButton *button )
1237{ 1239{
1238 connect(button, SIGNAL(clicked(int)), this, SIGNAL( clicked( int ) ) ); 1240 connect(button, SIGNAL(clicked(int)), this, SIGNAL( clicked( int ) ) );
1239 connect(button, SIGNAL(doubleClicked(int)), this, SIGNAL( doubleClicked( int ) ) ); 1241 connect(button, SIGNAL(doubleClicked(int)), this, SIGNAL( doubleClicked( int ) ) );
1240 connect(button, SIGNAL(released(int)), this, SIGNAL( released( int ) ) ); 1242 connect(button, SIGNAL(released(int)), this, SIGNAL( released( int ) ) );
1241 connect(button, SIGNAL(pressed(int)), this, SIGNAL( pressed( int ) ) ); 1243 connect(button, SIGNAL(pressed(int)), this, SIGNAL( pressed( int ) ) );
1242 connect(button, SIGNAL(toggled(int)), this, SIGNAL( toggled( int ) ) ); 1244 connect(button, SIGNAL(toggled(int)), this, SIGNAL( toggled( int ) ) );
1243 connect(button, SIGNAL(highlighted(int, bool)), this, SIGNAL( highlighted( int, bool ) ) ); 1245 connect(button, SIGNAL(highlighted(int, bool)), this, SIGNAL( highlighted( int, bool ) ) );
1244} 1246}
1245 1247
1246void KToolBar::mousePressEvent ( QMouseEvent *m ) 1248void KToolBar::mousePressEvent ( QMouseEvent *m )
1247{ 1249{
1248 if ( !mainWindow() ) 1250 if ( !mainWindow() )
1249 return; 1251 return;
1250 QMainWindow *mw = mainWindow(); 1252 QMainWindow *mw = mainWindow();
1251 if ( mw->toolBarsMovable() && d->m_enableContext ) { 1253 if ( mw->toolBarsMovable() && d->m_enableContext ) {
1252 if ( m->button() == RightButton ) { 1254 if ( m->button() == RightButton ) {
1253 int i = contextMenu()->exec( m->globalPos(), 0 ); 1255 int i = contextMenu()->exec( m->globalPos(), 0 );
1254 switch ( i ) { 1256 switch ( i ) {
1255 case -1: 1257 case -1:
1256 return; // popup cancelled 1258 return; // popup cancelled
1257 case CONTEXT_LEFT: 1259 case CONTEXT_LEFT:
1258//US mw->moveDockWindow( this, DockLeft ); 1260//US mw->moveDockWindow( this, DockLeft );
1259 mw->moveToolBar( this, QMainWindow::Left ); 1261 mw->moveToolBar( this, QMainWindow::Left );
1260 break; 1262 break;
1261 case CONTEXT_RIGHT: 1263 case CONTEXT_RIGHT:
1262//US mw->moveDockWindow( this, DockRight ); 1264//US mw->moveDockWindow( this, DockRight );
1263 mw->moveToolBar( this, QMainWindow::Right ); 1265 mw->moveToolBar( this, QMainWindow::Right );
1264 break; 1266 break;
1265 case CONTEXT_TOP: 1267 case CONTEXT_TOP:
1266//US mw->moveDockWindow( this, DockTop ); 1268//US mw->moveDockWindow( this, DockTop );
1267 mw->moveToolBar( this, QMainWindow::Top ); 1269 mw->moveToolBar( this, QMainWindow::Top );
1268 break; 1270 break;
1269 case CONTEXT_BOTTOM: 1271 case CONTEXT_BOTTOM:
1270//US mw->moveDockWindow( this, DockBottom ); 1272//US mw->moveDockWindow( this, DockBottom );
1271 mw->moveToolBar( this, QMainWindow::Bottom ); 1273 mw->moveToolBar( this, QMainWindow::Bottom );
1272 break; 1274 break;
1273 case CONTEXT_FLOAT: 1275 case CONTEXT_FLOAT:
1274 break; 1276 break;
1275 case CONTEXT_FLAT: 1277 case CONTEXT_FLAT:
1276//US mw->moveDockWindow( this, DockMinimized ); 1278//US mw->moveDockWindow( this, DockMinimized );
1277 mw->moveToolBar( this, QMainWindow::Minimized ); 1279 mw->moveToolBar( this, QMainWindow::Minimized );
1278 break; 1280 break;
1279 case CONTEXT_ICONS: 1281 case CONTEXT_ICONS:
1280 setIconText( IconOnly ); 1282 setIconText( IconOnly );
1281 break; 1283 break;
1282 case CONTEXT_TEXTRIGHT: 1284 case CONTEXT_TEXTRIGHT:
1283 setIconText( IconTextRight ); 1285 setIconText( IconTextRight );
1284 break; 1286 break;
1285 case CONTEXT_TEXT: 1287 case CONTEXT_TEXT:
1286 setIconText( TextOnly ); 1288 setIconText( TextOnly );
1287 break; 1289 break;
1288 case CONTEXT_TEXTUNDER: 1290 case CONTEXT_TEXTUNDER:
1289 setIconText( IconTextBottom ); 1291 setIconText( IconTextBottom );
1290 break; 1292 break;
1291 default: 1293 default:
1292 if ( i >= CONTEXT_ICONSIZES ) 1294 if ( i >= CONTEXT_ICONSIZES )
1293 setIconSize( i - CONTEXT_ICONSIZES ); 1295 setIconSize( i - CONTEXT_ICONSIZES );
1294 else 1296 else
1295 return; // assume this was an action handled elsewhere, no need for setSettingsDirty() 1297 return; // assume this was an action handled elsewhere, no need for setSettingsDirty()
1296 } 1298 }
1297/*US 1299/*US
1298 if ( mw->inherits("KMainWindow") ) 1300 if ( mw->inherits("KMainWindow") )
1299 static_cast<KMainWindow *>(mw)->setSettingsDirty(); 1301 static_cast<KMainWindow *>(mw)->setSettingsDirty();
1300*/ 1302*/
1301 } 1303 }
1302 } 1304 }
1303} 1305}
1304 1306
1305 1307
1306void KToolBar::rebuildLayout() 1308void KToolBar::rebuildLayout()
1307{ 1309{
1308 1310
1309 for(QWidget *w=d->idleButtons.first(); w; w=d->idleButtons.next()) 1311 for(QWidget *w=d->idleButtons.first(); w; w=d->idleButtons.next())
1310 w->blockSignals(false); 1312 w->blockSignals(false);
1311 d->idleButtons.clear(); 1313 d->idleButtons.clear();
1312 1314
1313 layoutTimer->stop(); 1315 layoutTimer->stop();
1314 QApplication::sendPostedEvents( this, QEvent::ChildInserted ); 1316 QApplication::sendPostedEvents( this, QEvent::ChildInserted );
1315 QBoxLayout *l = boxLayout(); 1317 QBoxLayout *l = boxLayout();
1316 l->setMargin( 1 ); 1318 l->setMargin( 1 );
1317 // clear the old layout 1319 // clear the old layout
1318 QLayoutIterator it = l->iterator(); 1320 QLayoutIterator it = l->iterator();
1319 1321
1320 while ( it.current() ) { 1322 while ( it.current() ) {
1321 it.deleteCurrent(); 1323 it.deleteCurrent();
1322 } 1324 }
1323 for ( QWidget *w = widgets.first(); w; w = widgets.next() ) { 1325 for ( QWidget *w = widgets.first(); w; w = widgets.next() ) {
1324 if ( w == rightAligned ) { 1326 if ( w == rightAligned ) {
1325 continue; 1327 continue;
1326 } 1328 }
1327 if ( w->inherits( "KToolBarSeparator" ) && 1329 if ( w->inherits( "KToolBarSeparator" ) &&
1328 !( (KToolBarSeparator*)w )->showLine() ) { 1330 !( (KToolBarSeparator*)w )->showLine() ) {
1329 l->addSpacing( 6 ); 1331 l->addSpacing( 6 );
1330 w->hide(); 1332 w->hide();
1331 continue; 1333 continue;
1332 } 1334 }
1333 if ( w->inherits( "QPopupMenu" ) ) 1335 if ( w->inherits( "QPopupMenu" ) )
1334 continue; 1336 continue;
1335 l->addWidget( w ); 1337 l->addWidget( w );
1336 w->show(); 1338 w->show();
1337 } 1339 }
1338 if ( rightAligned ) { 1340 if ( rightAligned ) {
1339 l->addStretch(); 1341 l->addStretch();
1340 l->addWidget( rightAligned ); 1342 l->addWidget( rightAligned );
1341 rightAligned->show(); 1343 rightAligned->show();
1342 } 1344 }
1343 1345
1344 if ( fullSize() ) { 1346 if ( fullSize() ) {
1345 // This code sucks. It makes the last combo in a toolbar VERY big (e.g. zoom combo in kword). 1347 // This code sucks. It makes the last combo in a toolbar VERY big (e.g. zoom combo in kword).
1346 //if ( !stretchableWidget && widgets.last() && 1348 //if ( !stretchableWidget && widgets.last() &&
1347 // !widgets.last()->inherits( "QButton" ) && !widgets.last()->inherits( "KAnimWidget" ) ) 1349 // !widgets.last()->inherits( "QButton" ) && !widgets.last()->inherits( "KAnimWidget" ) )
1348 // setStretchableWidget( widgets.last() ); 1350 // setStretchableWidget( widgets.last() );
1349 if ( !rightAligned ) 1351 if ( !rightAligned )
1350 l->addStretch(); 1352 l->addStretch();
1351 if ( stretchableWidget ) 1353 if ( stretchableWidget )
1352 l->setStretchFactor( stretchableWidget, 10 ); 1354 l->setStretchFactor( stretchableWidget, 10 );
1353 } 1355 }
1354 l->invalidate(); 1356 l->invalidate();
1355 QApplication::postEvent( this, new QEvent( QEvent::LayoutHint ) ); 1357 QApplication::postEvent( this, new QEvent( QEvent::LayoutHint ) );
1356 //#endif //DESKTOP_VERSION 1358 //#endif //DESKTOP_VERSION
1357} 1359}
1358 1360
1359void KToolBar::childEvent( QChildEvent *e ) 1361void KToolBar::childEvent( QChildEvent *e )
1360{ 1362{
1361 1363
1362 if ( e->child()->isWidgetType() ) { 1364 if ( e->child()->isWidgetType() ) {
1363 QWidget * w = (QWidget*)e->child(); 1365 QWidget * w = (QWidget*)e->child();
1364 if ( e->type() == QEvent::ChildInserted ) { 1366 if ( e->type() == QEvent::ChildInserted ) {
1365 if ( !e->child()->inherits( "QPopupMenu" ) && 1367 if ( !e->child()->inherits( "QPopupMenu" ) &&
1366 ::qstrcmp( "qt_dockwidget_internal", e->child()->name() ) != 0 ) { 1368 ::qstrcmp( "qt_dockwidget_internal", e->child()->name() ) != 0 ) {
1367 1369
1368 // prevent items that have been explicitly inserted by insert*() from 1370 // prevent items that have been explicitly inserted by insert*() from
1369 // being inserted again 1371 // being inserted again
1370 if ( !widget2id.contains( w ) ) 1372 if ( !widget2id.contains( w ) )
1371 { 1373 {
1372 int dummy = -1; 1374 int dummy = -1;
1373 insertWidgetInternal( w, dummy, -1 ); 1375 insertWidgetInternal( w, dummy, -1 );
1374 } 1376 }
1375 } 1377 }
1376 } else { 1378 } else {
1377 removeWidgetInternal( w ); 1379 removeWidgetInternal( w );
1378 } 1380 }
1379 if ( isVisibleTo( 0 ) ) 1381 if ( isVisibleTo( 0 ) )
1380 { 1382 {
1381 QBoxLayout *l = boxLayout(); 1383 QBoxLayout *l = boxLayout();
1382 // QLayout *l = layout(); 1384 // QLayout *l = layout();
1383 1385
1384 // clear the old layout so that we don't get unnecassery layout 1386 // clear the old layout so that we don't get unnecassery layout
1385 // changes till we have rebuild the thing 1387 // changes till we have rebuild the thing
1386 QLayoutIterator it = l->iterator(); 1388 QLayoutIterator it = l->iterator();
1387 while ( it.current() ) { 1389 while ( it.current() ) {
1388 it.deleteCurrent(); 1390 it.deleteCurrent();
1389 } 1391 }
1390 layoutTimer->start( 50, TRUE ); 1392 layoutTimer->start( 50, TRUE );
1391 } 1393 }
1392 } 1394 }
1393 QToolBar::childEvent( e ); 1395 QToolBar::childEvent( e );
1394} 1396}
1395 1397
1396void KToolBar::insertWidgetInternal( QWidget *w, int &index, int id ) 1398void KToolBar::insertWidgetInternal( QWidget *w, int &index, int id )
1397{ 1399{
1398 // we can't have it in widgets, or something is really wrong 1400 // we can't have it in widgets, or something is really wrong
1399 //widgets.removeRef( w ); 1401 //widgets.removeRef( w );
1400 1402
1401 connect( w, SIGNAL( destroyed() ), 1403 connect( w, SIGNAL( destroyed() ),
1402 this, SLOT( widgetDestroyed() ) ); 1404 this, SLOT( widgetDestroyed() ) );
1403 if ( index == -1 || index > (int)widgets.count() ) { 1405 if ( index == -1 || index > (int)widgets.count() ) {
1404 widgets.append( w ); 1406 widgets.append( w );
1405 index = (int)widgets.count(); 1407 index = (int)widgets.count();
1406 } 1408 }
1407 else 1409 else
1408 widgets.insert( index, w ); 1410 widgets.insert( index, w );
1409 if ( id == -1 ) 1411 if ( id == -1 )
1410 id = id2widget.count(); 1412 id = id2widget.count();
1411 id2widget.insert( id, w ); 1413 id2widget.insert( id, w );
1412 widget2id.insert( w, id ); 1414 widget2id.insert( w, id );
1413} 1415}
1414void KToolBar::repaintMe() 1416void KToolBar::repaintMe()
1415{ 1417{
1416 setUpdatesEnabled( true ); 1418 setUpdatesEnabled( true );
1417 QToolBar::repaint( true ); 1419 QToolBar::repaint( true );
1418 qDebug(" KToolBar::repaintMe() "); 1420 qDebug(" KToolBar::repaintMe() ");
1419} 1421}
1420 1422
1421void KToolBar::showEvent( QShowEvent *e ) 1423void KToolBar::showEvent( QShowEvent *e )
1422{ 1424{
1423 rebuildLayout(); 1425 rebuildLayout();
1424 QToolBar::showEvent( e ); 1426 QToolBar::showEvent( e );
1425} 1427}
1426 1428
1427void KToolBar::setStretchableWidget( QWidget *w ) 1429void KToolBar::setStretchableWidget( QWidget *w )
1428{ 1430{
1429 QToolBar::setStretchableWidget( w ); 1431 QToolBar::setStretchableWidget( w );
1430 stretchableWidget = w; 1432 stretchableWidget = w;
1431} 1433}
1432 1434
1433QSizePolicy KToolBar::sizePolicy() const 1435QSizePolicy KToolBar::sizePolicy() const
1434{ 1436{
1435 if ( orientation() == Horizontal ) 1437 if ( orientation() == Horizontal )
1436 return QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ); 1438 return QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed );
1437 else 1439 else
1438 return QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Expanding ); 1440 return QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Expanding );
1439} 1441}
1440 1442
1441QSize KToolBar::sizeHint() const 1443QSize KToolBar::sizeHint() const
1442{ 1444{
1443 return QToolBar::sizeHint(); 1445 QSize sh = QToolBar::sizeHint();
1446 //qDebug("%x KToolBar::sizeHint() %d %d ",this, QToolBar::sizeHint().width(),QToolBar::sizeHint().height() );
1447 if ( sh.height() <= 20 || sh.width() < 60 )
1448 return QSize( sizeHintW, sizeHintH );
1449 KToolBar* ttt = (KToolBar*) this;
1450 ttt->sizeHintW = sh.width();
1451 ttt->sizeHintH = sh.height();
1452 return sh;
1453 //return QToolBar::sizeHint();
1444#if 0 1454#if 0
1445 QWidget::polish(); 1455 QWidget::polish();
1446 static int iii = 0; 1456 static int iii = 0;
1447 ++iii; 1457 ++iii;
1448 qDebug("++++++++ KToolBar::sizeHint() %d ", iii ); 1458 qDebug("++++++++ KToolBar::sizeHint() %d ", iii );
1449 int margin = static_cast<QWidget*>(ncThis)->layout()->margin(); 1459 int margin = static_cast<QWidget*>(ncThis)->layout()->margin();
1450 switch( barPos() ) 1460 switch( barPos() )
1451 { 1461 {
1452 case KToolBar::Top: 1462 case KToolBar::Top:
1453 case KToolBar::Bottom: 1463 case KToolBar::Bottom:
1454 for ( QWidget *w = widgets.first(); w; w =widgets.next() ) 1464 for ( QWidget *w = widgets.first(); w; w =widgets.next() )
1455 { 1465 {
1456 if ( w->inherits( "KToolBarSeparator" ) && 1466 if ( w->inherits( "KToolBarSeparator" ) &&
1457 !( static_cast<KToolBarSeparator*>(w)->showLine() ) ) 1467 !( static_cast<KToolBarSeparator*>(w)->showLine() ) )
1458 { 1468 {
1459 minSize += QSize(6, 0); 1469 minSize += QSize(6, 0);
1460 } 1470 }
1461 else 1471 else
1462 { 1472 {
1463 QSize sh = w->sizeHint(); 1473 QSize sh = w->sizeHint();
1464 if (!sh.isValid()) 1474 if (!sh.isValid())
1465 sh = w->minimumSize(); 1475 sh = w->minimumSize();
1466 minSize = minSize.expandedTo(QSize(0, sh.height())); 1476 minSize = minSize.expandedTo(QSize(0, sh.height()));
1467 minSize += QSize(sh.width()+1, 0); 1477 minSize += QSize(sh.width()+1, 0);
1468 } 1478 }
1469 } 1479 }
1470/*US 1480/*US
1471 minSize += QSize(QApplication::style().pixelMetric( QStyle::PM_DockWindowHandleExtent ), 0); 1481 minSize += QSize(QApplication::style().pixelMetric( QStyle::PM_DockWindowHandleExtent ), 0);
1472*/ 1482*/
1473 minSize += QSize(margin*2, margin*2); 1483 minSize += QSize(margin*2, margin*2);
1474 break; 1484 break;
1475 1485
1476 case KToolBar::Left: 1486 case KToolBar::Left:
1477 case KToolBar::Right: 1487 case KToolBar::Right:
1478 for ( QWidget *w = widgets.first(); w; w = widgets.next() ) 1488 for ( QWidget *w = widgets.first(); w; w = widgets.next() )
1479 { 1489 {
1480 if ( w->inherits( "KToolBarSeparator" ) && 1490 if ( w->inherits( "KToolBarSeparator" ) &&
1481 !( static_cast<KToolBarSeparator*>(w)->showLine() ) ) 1491 !( static_cast<KToolBarSeparator*>(w)->showLine() ) )
1482 { 1492 {
1483 minSize += QSize(0, 6); 1493 minSize += QSize(0, 6);
1484 } 1494 }
1485 else 1495 else
1486 { 1496 {
1487 QSize sh = w->sizeHint(); 1497 QSize sh = w->sizeHint();
1488 if (!sh.isValid()) 1498 if (!sh.isValid())
1489 sh = w->minimumSize(); 1499 sh = w->minimumSize();
1490 minSize = minSize.expandedTo(QSize(sh.width(), 0)); 1500 minSize = minSize.expandedTo(QSize(sh.width(), 0));
1491 minSize += QSize(0, sh.height()+1); 1501 minSize += QSize(0, sh.height()+1);
1492 } 1502 }
1493 } 1503 }
1494/*US 1504/*US
1495 minSize += QSize(0, QApplication::style().pixelMetric( QStyle::PM_DockWindowHandleExtent )); 1505 minSize += QSize(0, QApplication::style().pixelMetric( QStyle::PM_DockWindowHandleExtent ));
1496*/ 1506*/
1497 minSize += QSize(margin*2, margin*2); 1507 minSize += QSize(margin*2, margin*2);
1498 break; 1508 break;
1499 1509
1500 default: 1510 default:
1501 minSize = QToolBar::sizeHint(); 1511 minSize = QToolBar::sizeHint();
1502 break; 1512 break;
1503 } 1513 }
1504 return minSize; 1514 return minSize;
1505#endif 1515#endif
1506} 1516}
1507 1517
1508QSize KToolBar::minimumSize() const 1518QSize KToolBar::minimumSize() const
1509{ 1519{
1510 return minimumSizeHint(); 1520 return minimumSizeHint();
1511} 1521}
1512 1522
1513QSize KToolBar::minimumSizeHint() const 1523QSize KToolBar::minimumSizeHint() const
1514{ 1524{
1515 return sizeHint(); 1525 return sizeHint();
1516} 1526}
1517 1527
1518bool KToolBar::highlight() const 1528bool KToolBar::highlight() const
1519{ 1529{
1520 return d->m_highlight; 1530 return d->m_highlight;
1521} 1531}
1522 1532
1523void KToolBar::hide() 1533void KToolBar::hide()
1524{ 1534{
1525 QToolBar::hide(); 1535 QToolBar::hide();
1526} 1536}
1527 1537
1528void KToolBar::show() 1538void KToolBar::show()
1529{ 1539{
1530 QToolBar::show(); 1540 QToolBar::show();
1531} 1541}
1532 1542
1533void KToolBar::resizeEvent( QResizeEvent *e ) 1543void KToolBar::resizeEvent( QResizeEvent *e )
1534{ 1544{
1535 bool b = isUpdatesEnabled(); 1545 bool b = isUpdatesEnabled();
1536 setUpdatesEnabled( FALSE ); 1546 setUpdatesEnabled( FALSE );
1537 QToolBar::resizeEvent( e ); 1547 QToolBar::resizeEvent( e );
1538 if (b) 1548 if (b)
1539 d->repaintTimer.start( 100, true ); 1549 d->repaintTimer.start( 100, true );
1540} 1550}
1541 1551
1542void KToolBar::slotIconChanged(int group) 1552void KToolBar::slotIconChanged(int group)
1543{ 1553{
1544 if ((group != KIcon::Toolbar) && (group != KIcon::MainToolbar)) 1554 if ((group != KIcon::Toolbar) && (group != KIcon::MainToolbar))
1545 return; 1555 return;
1546 if ((group == KIcon::MainToolbar) != !::qstrcmp(name(), "mainToolBar")) 1556 if ((group == KIcon::MainToolbar) != !::qstrcmp(name(), "mainToolBar"))
1547 return; 1557 return;
1548 1558
1549 emit modechange(); 1559 emit modechange();
1550 if (isVisible()) 1560 if (isVisible())
1551 updateGeometry(); 1561 updateGeometry();
1552} 1562}
1553 1563
1554void KToolBar::slotReadConfig() 1564void KToolBar::slotReadConfig()
1555{ 1565{
1556 //kdDebug(220) << "KToolBar::slotReadConfig" << endl; 1566 //kdDebug(220) << "KToolBar::slotReadConfig" << endl;
1557 // Read appearance settings (hmm, we used to do both here, 1567 // Read appearance settings (hmm, we used to do both here,
1558 // but a well behaved application will call applyMainWindowSettings 1568 // but a well behaved application will call applyMainWindowSettings
1559 // anyway, right ?) 1569 // anyway, right ?)
1560 applyAppearanceSettings(KGlobal::config(), QString::null ); 1570 applyAppearanceSettings(KGlobal::config(), QString::null );
1561} 1571}
1562 1572
1563void KToolBar::slotAppearanceChanged() 1573void KToolBar::slotAppearanceChanged()
1564{ 1574{
1565 // Read appearance settings from global file. 1575 // Read appearance settings from global file.
1566 applyAppearanceSettings(KGlobal::config(), QString::null, true /* lose local settings */ ); 1576 applyAppearanceSettings(KGlobal::config(), QString::null, true /* lose local settings */ );
1567 // And remember to save the new look later 1577 // And remember to save the new look later
1568/*US 1578/*US
1569 if ( mainWindow() && mainWindow()->inherits( "KMainWindow" ) ) 1579 if ( mainWindow() && mainWindow()->inherits( "KMainWindow" ) )
1570 static_cast<KMainWindow *>(mainWindow())->setSettingsDirty(); 1580 static_cast<KMainWindow *>(mainWindow())->setSettingsDirty();
1571*/ 1581*/
1572} 1582}
1573 1583
1574//static 1584//static
1575bool KToolBar::highlightSetting() 1585bool KToolBar::highlightSetting()
1576{ 1586{
1577 QString grpToolbar(QString::fromLatin1("Toolbar style")); 1587 QString grpToolbar(QString::fromLatin1("Toolbar style"));
1578 KConfigGroupSaver saver(KGlobal::config(), grpToolbar); 1588 KConfigGroupSaver saver(KGlobal::config(), grpToolbar);
1579 return KGlobal::config()->readBoolEntry(QString::fromLatin1("Highlighting"),true); 1589 return KGlobal::config()->readBoolEntry(QString::fromLatin1("Highlighting"),true);
1580} 1590}
1581 1591
1582//static 1592//static
1583bool KToolBar::transparentSetting() 1593bool KToolBar::transparentSetting()
1584{ 1594{
1585 QString grpToolbar(QString::fromLatin1("Toolbar style")); 1595 QString grpToolbar(QString::fromLatin1("Toolbar style"));
1586 KConfigGroupSaver saver(KGlobal::config(), grpToolbar); 1596 KConfigGroupSaver saver(KGlobal::config(), grpToolbar);
1587 return KGlobal::config()->readBoolEntry(QString::fromLatin1("TransparentMoving"),true); 1597 return KGlobal::config()->readBoolEntry(QString::fromLatin1("TransparentMoving"),true);
1588} 1598}
1589 1599
1590//static 1600//static
1591KToolBar::IconText KToolBar::iconTextSetting() 1601KToolBar::IconText KToolBar::iconTextSetting()
1592{ 1602{
1593 QString grpToolbar(QString::fromLatin1("Toolbar style")); 1603 QString grpToolbar(QString::fromLatin1("Toolbar style"));
1594 KConfigGroupSaver saver(KGlobal::config(), grpToolbar); 1604 KConfigGroupSaver saver(KGlobal::config(), grpToolbar);
1595 QString icontext = KGlobal::config()->readEntry(QString::fromLatin1("IconText"),QString::fromLatin1("IconOnly")); 1605 QString icontext = KGlobal::config()->readEntry(QString::fromLatin1("IconText"),QString::fromLatin1("IconOnly"));
1596 if ( icontext == "IconTextRight" ) 1606 if ( icontext == "IconTextRight" )
1597 return IconTextRight; 1607 return IconTextRight;
1598 else if ( icontext == "IconTextBottom" ) 1608 else if ( icontext == "IconTextBottom" )
1599 return IconTextBottom; 1609 return IconTextBottom;
1600 else if ( icontext == "TextOnly" ) 1610 else if ( icontext == "TextOnly" )
1601 return TextOnly; 1611 return TextOnly;
1602 else 1612 else
1603 return IconOnly; 1613 return IconOnly;
1604} 1614}
1605 1615
1606void KToolBar::applyAppearanceSettings(KConfig *config, const QString &_configGroup, bool forceGlobal) 1616void KToolBar::applyAppearanceSettings(KConfig *config, const QString &_configGroup, bool forceGlobal)
1607{ 1617{
1608 return; 1618 return;
1609 QString configGroup = _configGroup.isEmpty() ? settingsGroup() : _configGroup; 1619 QString configGroup = _configGroup.isEmpty() ? settingsGroup() : _configGroup;
1610 //kdDebug(220) << "KToolBar::applyAppearanceSettings: configGroup=" << configGroup << endl; 1620 //kdDebug(220) << "KToolBar::applyAppearanceSettings: configGroup=" << configGroup << endl;
1611 // We have application-specific settings in the XML file, 1621 // We have application-specific settings in the XML file,
1612 // and nothing in the application's config file 1622 // and nothing in the application's config file
1613 // -> don't apply the global defaults, the XML ones are preferred 1623 // -> don't apply the global defaults, the XML ones are preferred
1614 // See applySettings for a full explanation 1624 // See applySettings for a full explanation
1615/*US :we do not support xml files 1625/*US :we do not support xml files
1616 if ( d->m_xmlguiClient && !d->m_xmlguiClient->xmlFile().isEmpty() && 1626 if ( d->m_xmlguiClient && !d->m_xmlguiClient->xmlFile().isEmpty() &&
1617 !config->hasGroup(configGroup) ) 1627 !config->hasGroup(configGroup) )
1618 { 1628 {
1619 //kdDebug(220) << "skipping global defaults, using XML ones instead" << endl; 1629 //kdDebug(220) << "skipping global defaults, using XML ones instead" << endl;
1620 return; 1630 return;
1621 } 1631 }
1622*/ 1632*/
1623 if ( !config->hasGroup(configGroup) ) 1633 if ( !config->hasGroup(configGroup) )
1624 { 1634 {
1625 //kdDebug(220) << "skipping global defaults, using XML ones instead" << endl; 1635 //kdDebug(220) << "skipping global defaults, using XML ones instead" << endl;
1626 return; 1636 return;
1627 } 1637 }
1628 1638
1629 1639
1630 KConfig *gconfig = KGlobal::config(); 1640 KConfig *gconfig = KGlobal::config();
1631/*US 1641/*US
1632 static const QString &attrIconText = KGlobal::staticQString("IconText"); 1642 static const QString &attrIconText = KGlobal::staticQString("IconText");
1633 static const QString &attrHighlight = KGlobal::staticQString("Highlighting"); 1643 static const QString &attrHighlight = KGlobal::staticQString("Highlighting");
1634 static const QString &attrTrans = KGlobal::staticQString("TransparentMoving"); 1644 static const QString &attrTrans = KGlobal::staticQString("TransparentMoving");
1635 static const QString &attrSize = KGlobal::staticQString("IconSize"); 1645 static const QString &attrSize = KGlobal::staticQString("IconSize");
1636*/ 1646*/
1637 // we actually do this in two steps. 1647 // we actually do this in two steps.
1638 // First, we read in the global styles [Toolbar style] (from the KControl module). 1648 // First, we read in the global styles [Toolbar style] (from the KControl module).
1639 // Then, if the toolbar is NOT 'mainToolBar', we will also try to read in [barname Toolbar style] 1649 // Then, if the toolbar is NOT 'mainToolBar', we will also try to read in [barname Toolbar style]
1640 bool highlight; 1650 bool highlight;
1641 int transparent; 1651 int transparent;
1642 QString icontext; 1652 QString icontext;
1643 int iconsize = 0; 1653 int iconsize = 0;
1644 1654
1645 // this is the first iteration 1655 // this is the first iteration
1646 QString grpToolbar(QString::fromLatin1("Toolbar style")); 1656 QString grpToolbar(QString::fromLatin1("Toolbar style"));
1647 { // start block for KConfigGroupSaver 1657 { // start block for KConfigGroupSaver
1648 KConfigGroupSaver saver(gconfig, grpToolbar); 1658 KConfigGroupSaver saver(gconfig, grpToolbar);
1649 1659
1650 // first, get the generic settings 1660 // first, get the generic settings
1651//US highlight = gconfig->readBoolEntry(attrHighlight, true); 1661//US highlight = gconfig->readBoolEntry(attrHighlight, true);
1652 highlight = gconfig->readBoolEntry("Highlighting", true); 1662 highlight = gconfig->readBoolEntry("Highlighting", true);
1653//US transparent = gconfig->readBoolEntry(attrTrans, true); 1663//US transparent = gconfig->readBoolEntry(attrTrans, true);
1654 transparent = gconfig->readBoolEntry("TransparentMoving", true); 1664 transparent = gconfig->readBoolEntry("TransparentMoving", true);
1655 1665
1656 // we read in the IconText property *only* if we intend on actually 1666 // we read in the IconText property *only* if we intend on actually
1657 // honoring it 1667 // honoring it
1658 if (d->m_honorStyle) 1668 if (d->m_honorStyle)
1659//US d->IconTextDefault = gconfig->readEntry(attrIconText, d->IconTextDefault); 1669//US d->IconTextDefault = gconfig->readEntry(attrIconText, d->IconTextDefault);
1660 d->IconTextDefault = gconfig->readEntry("IconText", d->IconTextDefault); 1670 d->IconTextDefault = gconfig->readEntry("IconText", d->IconTextDefault);
1661 else 1671 else
1662 d->IconTextDefault = "IconOnly"; 1672 d->IconTextDefault = "IconOnly";
1663 1673
1664 // Use the default icon size for toolbar icons. 1674 // Use the default icon size for toolbar icons.
1665//US d->IconSizeDefault = gconfig->readNumEntry(attrSize, d->IconSizeDefault); 1675//US d->IconSizeDefault = gconfig->readNumEntry(attrSize, d->IconSizeDefault);
1666 d->IconSizeDefault = gconfig->readNumEntry("IconSize", d->IconSizeDefault); 1676 d->IconSizeDefault = gconfig->readNumEntry("IconSize", d->IconSizeDefault);
1667 1677
1668 if ( !forceGlobal && config->hasGroup(configGroup) ) 1678 if ( !forceGlobal && config->hasGroup(configGroup) )
1669 { 1679 {
1670 config->setGroup(configGroup); 1680 config->setGroup(configGroup);
1671 1681
1672 // first, get the generic settings 1682 // first, get the generic settings
1673//US highlight = config->readBoolEntry(attrHighlight, highlight); 1683//US highlight = config->readBoolEntry(attrHighlight, highlight);
1674 highlight = config->readBoolEntry("Highlighting", highlight); 1684 highlight = config->readBoolEntry("Highlighting", highlight);
1675//US transparent = config->readBoolEntry(attrTrans, transparent); 1685//US transparent = config->readBoolEntry(attrTrans, transparent);
1676 transparent = config->readBoolEntry("TransparentMoving", transparent); 1686 transparent = config->readBoolEntry("TransparentMoving", transparent);
1677 // now we always read in the IconText property 1687 // now we always read in the IconText property
1678//US icontext = config->readEntry(attrIconText, d->IconTextDefault); 1688//US icontext = config->readEntry(attrIconText, d->IconTextDefault);
1679 icontext = config->readEntry("IconText", d->IconTextDefault); 1689 icontext = config->readEntry("IconText", d->IconTextDefault);
1680 1690
1681 // now get the size 1691 // now get the size
1682//US iconsize = config->readNumEntry(attrSize, d->IconSizeDefault); 1692//US iconsize = config->readNumEntry(attrSize, d->IconSizeDefault);
1683 iconsize = config->readNumEntry("IconSize", d->IconSizeDefault); 1693 iconsize = config->readNumEntry("IconSize", d->IconSizeDefault);
1684 } 1694 }
1685 else 1695 else
1686 { 1696 {
1687 iconsize = d->IconSizeDefault; 1697 iconsize = d->IconSizeDefault;
1688 icontext = d->IconTextDefault; 1698 icontext = d->IconTextDefault;
1689 } 1699 }
1690 1700
1691 // revert back to the old group 1701 // revert back to the old group
1692 } // end block for KConfigGroupSaver 1702 } // end block for KConfigGroupSaver
1693 1703
1694 bool doUpdate = false; 1704 bool doUpdate = false;
1695 1705
1696 IconText icon_text; 1706 IconText icon_text;
1697 if ( icontext == "IconTextRight" ) 1707 if ( icontext == "IconTextRight" )
1698 icon_text = IconTextRight; 1708 icon_text = IconTextRight;
1699 else if ( icontext == "IconTextBottom" ) 1709 else if ( icontext == "IconTextBottom" )
1700 icon_text = IconTextBottom; 1710 icon_text = IconTextBottom;
1701 else if ( icontext == "TextOnly" ) 1711 else if ( icontext == "TextOnly" )
1702 icon_text = TextOnly; 1712 icon_text = TextOnly;
1703 else 1713 else
1704 icon_text = IconOnly; 1714 icon_text = IconOnly;
1705 1715
1706 // check if the icon/text has changed 1716 // check if the icon/text has changed
1707 if (icon_text != d->m_iconText) { 1717 if (icon_text != d->m_iconText) {
1708 //kdDebug(220) << "KToolBar::applyAppearanceSettings setIconText " << icon_text << endl; 1718 //kdDebug(220) << "KToolBar::applyAppearanceSettings setIconText " << icon_text << endl;
1709 setIconText(icon_text, false); 1719 setIconText(icon_text, false);
1710 doUpdate = true; 1720 doUpdate = true;
1711 } 1721 }
1712 1722
1713 // ...and check if the icon size has changed 1723 // ...and check if the icon size has changed
1714 if (iconsize != d->m_iconSize) { 1724 if (iconsize != d->m_iconSize) {
1715 setIconSize(iconsize, false); 1725 setIconSize(iconsize, false);
1716 doUpdate = true; 1726 doUpdate = true;
1717 } 1727 }
1718 1728
1719 QMainWindow *mw = mainWindow(); 1729 QMainWindow *mw = mainWindow();
1720 1730
1721 // ...and if we should highlight 1731 // ...and if we should highlight
1722 if ( highlight != d->m_highlight ) { 1732 if ( highlight != d->m_highlight ) {
1723 d->m_highlight = highlight; 1733 d->m_highlight = highlight;
1724 doUpdate = true; 1734 doUpdate = true;
1725 } 1735 }
1726 1736
1727 // ...and if we should move transparently 1737 // ...and if we should move transparently
1728 if ( mw && transparent != (!mw->opaqueMoving()) ) { 1738 if ( mw && transparent != (!mw->opaqueMoving()) ) {
1729 mw->setOpaqueMoving( !transparent ); 1739 mw->setOpaqueMoving( !transparent );
1730 } 1740 }
1731 1741
1732 if (doUpdate) 1742 if (doUpdate)
1733 emit modechange(); // tell buttons what happened 1743 emit modechange(); // tell buttons what happened
1734 if (isVisible ()) 1744 if (isVisible ())
1735 updateGeometry(); 1745 updateGeometry();
1736} 1746}
1737 1747
1738void KToolBar::applySettings(KConfig *config, const QString &_configGroup) 1748void KToolBar::applySettings(KConfig *config, const QString &_configGroup)
1739{ 1749{
1740 //kdDebug(220) << "KToolBar::applySettings group=" << _configGroup << endl; 1750 //kdDebug(220) << "KToolBar::applySettings group=" << _configGroup << endl;
1741 1751
1742 QString configGroup = _configGroup.isEmpty() ? settingsGroup() : _configGroup; 1752 QString configGroup = _configGroup.isEmpty() ? settingsGroup() : _configGroup;
1743 1753
1744 /* 1754 /*
1745 Let's explain this a bit more in details. 1755 Let's explain this a bit more in details.
1746 The order in which we apply settings is : 1756 The order in which we apply settings is :
1747 Global config / <appnamerc> user settings if no XMLGUI is used 1757 Global config / <appnamerc> user settings if no XMLGUI is used
1748 Global config / App-XML attributes / <appnamerc> user settings if XMLGUI is used 1758 Global config / App-XML attributes / <appnamerc> user settings if XMLGUI is used
1749 1759
1750 So in the first case, we simply read everything from KConfig as below, 1760 So in the first case, we simply read everything from KConfig as below,
1751 but in the second case we don't do anything here if there is no app-specific config, 1761 but in the second case we don't do anything here if there is no app-specific config,
1752 and the XMLGUI uses the static methods of this class to get the global defaults. 1762 and the XMLGUI uses the static methods of this class to get the global defaults.
1753 1763
1754 Global config doesn't include position (index, offset, newline and hidden/shown). 1764 Global config doesn't include position (index, offset, newline and hidden/shown).
1755 */ 1765 */
1756 1766
1757 // First the appearance stuff - the one which has a global config 1767 // First the appearance stuff - the one which has a global config
1758 applyAppearanceSettings( config, _configGroup ); 1768 applyAppearanceSettings( config, _configGroup );
1759 1769
1760 // ...and now the position stuff 1770 // ...and now the position stuff
1761 if ( config->hasGroup(configGroup) ) 1771 if ( config->hasGroup(configGroup) )
1762 { 1772 {
1763 KConfigGroupSaver cgs(config, configGroup); 1773 KConfigGroupSaver cgs(config, configGroup);
1764/*US 1774/*US
1765 static const QString &attrPosition = KGlobal::staticQString("Position"); 1775 static const QString &attrPosition = KGlobal::staticQString("Position");
1766 static const QString &attrIndex = KGlobal::staticQString("Index"); 1776 static const QString &attrIndex = KGlobal::staticQString("Index");
1767 static const QString &attrOffset = KGlobal::staticQString("Offset"); 1777 static const QString &attrOffset = KGlobal::staticQString("Offset");
1768 static const QString &attrNewLine = KGlobal::staticQString("NewLine"); 1778 static const QString &attrNewLine = KGlobal::staticQString("NewLine");
1769 static const QString &attrHidden = KGlobal::staticQString("Hidden"); 1779 static const QString &attrHidden = KGlobal::staticQString("Hidden");
1770 1780
1771 QString position = config->readEntry(attrPosition, d->PositionDefault); 1781 QString position = config->readEntry(attrPosition, d->PositionDefault);
1772 int index = config->readNumEntry(attrIndex, d->IndexDefault); 1782 int index = config->readNumEntry(attrIndex, d->IndexDefault);
1773 int offset = config->readNumEntry(attrOffset, d->OffsetDefault); 1783 int offset = config->readNumEntry(attrOffset, d->OffsetDefault);
1774 bool newLine = config->readBoolEntry(attrNewLine, d->NewLineDefault); 1784 bool newLine = config->readBoolEntry(attrNewLine, d->NewLineDefault);
1775 bool hidden = config->readBoolEntry(attrHidden, d->HiddenDefault); 1785 bool hidden = config->readBoolEntry(attrHidden, d->HiddenDefault);
1776*/ 1786*/
1777 1787
1778 QString position = config->readEntry("Position", d->PositionDefault); 1788 QString position = config->readEntry("Position", d->PositionDefault);
1779 int index = config->readNumEntry("Index", d->IndexDefault); 1789 int index = config->readNumEntry("Index", d->IndexDefault);
1780 int offset = config->readNumEntry("Offset", d->OffsetDefault); 1790 int offset = config->readNumEntry("Offset", d->OffsetDefault);
1781 bool newLine = config->readBoolEntry("NewLine", d->NewLineDefault); 1791 bool newLine = config->readBoolEntry("NewLine", d->NewLineDefault);
1782 bool hidden = config->readBoolEntry("Hidden", d->HiddenDefault); 1792 bool hidden = config->readBoolEntry("Hidden", d->HiddenDefault);
1783 1793
1784/*US Dock pos(DockTop); 1794/*US Dock pos(DockTop);
1785 if ( position == "Top" ) 1795 if ( position == "Top" )
1786 pos = DockTop; 1796 pos = DockTop;
1787 else if ( position == "Bottom" ) 1797 else if ( position == "Bottom" )
1788 pos = DockBottom; 1798 pos = DockBottom;
1789 else if ( position == "Left" ) 1799 else if ( position == "Left" )
1790 pos = DockLeft; 1800 pos = DockLeft;
1791 else if ( position == "Right" ) 1801 else if ( position == "Right" )
1792 pos = DockRight; 1802 pos = DockRight;
1793 else if ( position == "Floating" ) 1803 else if ( position == "Floating" )
1794 pos = DockTornOff; 1804 pos = DockTornOff;
1795 else if ( position == "Flat" ) 1805 else if ( position == "Flat" )
1796 pos = DockMinimized; 1806 pos = DockMinimized;
1797*/ 1807*/
1798 QMainWindow::ToolBarDock pos(QMainWindow::Top); 1808 QMainWindow::ToolBarDock pos(QMainWindow::Top);
1799 if ( position == "Top" ) 1809 if ( position == "Top" )
1800 pos = QMainWindow::Top; 1810 pos = QMainWindow::Top;
1801 else if ( position == "Bottom" ) 1811 else if ( position == "Bottom" )
1802 pos = QMainWindow::Bottom; 1812 pos = QMainWindow::Bottom;
1803 else if ( position == "Left" ) 1813 else if ( position == "Left" )
1804 pos = QMainWindow::Left; 1814 pos = QMainWindow::Left;
1805 else if ( position == "Right" ) 1815 else if ( position == "Right" )
1806 pos = QMainWindow::Right; 1816 pos = QMainWindow::Right;
1807 else if ( position == "Floating" ) 1817 else if ( position == "Floating" )
1808 pos = QMainWindow::TornOff; 1818 pos = QMainWindow::TornOff;
1809 else if ( position == "Flat" ) 1819 else if ( position == "Flat" )
1810 pos = QMainWindow::Minimized; 1820 pos = QMainWindow::Minimized;
1811 1821
1812 //kdDebug(220) << "KToolBar::applySettings hidden=" << hidden << endl; 1822 //kdDebug(220) << "KToolBar::applySettings hidden=" << hidden << endl;
1813 if (hidden) 1823 if (hidden)
1814 hide(); 1824 hide();
1815 else 1825 else
1816 show(); 1826 show();
1817 1827
1818 if ( mainWindow() ) 1828 if ( mainWindow() )
1819 { 1829 {
1820 QMainWindow *mw = mainWindow(); 1830 QMainWindow *mw = mainWindow();
1821 1831
1822 //kdDebug(220) << "KToolBar::applySettings updating ToolbarInfo" << endl; 1832 //kdDebug(220) << "KToolBar::applySettings updating ToolbarInfo" << endl;
1823 d->toolBarInfo = KToolBarPrivate::ToolBarInfo( pos, index, newLine, offset ); 1833 d->toolBarInfo = KToolBarPrivate::ToolBarInfo( pos, index, newLine, offset );
1824 1834
1825 // moveDockWindow calls QDockArea which does a reparent() on us with 1835 // moveDockWindow calls QDockArea which does a reparent() on us with
1826 // showIt = true, so we loose our visibility status 1836 // showIt = true, so we loose our visibility status
1827 bool doHide = isHidden(); 1837 bool doHide = isHidden();
1828 1838
1829//US mw->moveDockWindow( this, pos, newLine, index, offset ); 1839//US mw->moveDockWindow( this, pos, newLine, index, offset );
1830 mw->moveToolBar( this, pos, newLine, index, offset ); 1840 mw->moveToolBar( this, pos, newLine, index, offset );
1831 1841
1832 //kdDebug(220) << "KToolBar::applySettings " << name() << " moveDockWindow with pos=" << pos << " newLine=" << newLine << " idx=" << index << " offs=" << offset << endl; 1842 //kdDebug(220) << "KToolBar::applySettings " << name() << " moveDockWindow with pos=" << pos << " newLine=" << newLine << " idx=" << index << " offs=" << offset << endl;
1833 if ( doHide ) 1843 if ( doHide )
1834 hide(); 1844 hide();
1835 } 1845 }
1836 if (isVisible ()) 1846 if (isVisible ())
1837 updateGeometry(); 1847 updateGeometry();
1838 } 1848 }
1839} 1849}
1840 1850
1841bool KToolBar::event( QEvent *e ) 1851bool KToolBar::event( QEvent *e )
1842{ 1852{
1843 if ( (e->type() == QEvent::LayoutHint) && isUpdatesEnabled() ) 1853 if ( (e->type() == QEvent::LayoutHint) && isUpdatesEnabled() )
1844 d->repaintTimer.start( 100, true ); 1854 d->repaintTimer.start( 100, true );
1845 1855
1846 if (e->type() == QEvent::ChildInserted ) 1856 if (e->type() == QEvent::ChildInserted )
1847 { 1857 {
1848 // By pass QToolBar::event, 1858 // By pass QToolBar::event,
1849 // it will show() the inserted child and we don't want to 1859 // it will show() the inserted child and we don't want to
1850 // do that until we have rebuild the layout. 1860 // do that until we have rebuild the layout.
1851 childEvent((QChildEvent *)e); 1861 childEvent((QChildEvent *)e);
1852 return true; 1862 return true;
1853 } 1863 }
1854 1864
1855 return QToolBar::event( e ); 1865 return QToolBar::event( e );
1856} 1866}
1857 1867
1858void KToolBar::slotRepaint() 1868void KToolBar::slotRepaint()
1859{ 1869{
1860 setUpdatesEnabled( FALSE ); 1870 setUpdatesEnabled( FALSE );
1861 // Send a resizeEvent to update the "toolbar extension arrow" 1871 // Send a resizeEvent to update the "toolbar extension arrow"
1862 // (The button you get when your toolbar-items don't fit in 1872 // (The button you get when your toolbar-items don't fit in
1863 // the available space) 1873 // the available space)
1864 QResizeEvent ev(size(), size()); 1874 QResizeEvent ev(size(), size());
1865 resizeEvent(&ev); 1875 resizeEvent(&ev);
1866 //#ifdef DESKTOP_VERSION 1876 //#ifdef DESKTOP_VERSION
1867 QApplication::sendPostedEvents( this, QEvent::LayoutHint ); 1877 QApplication::sendPostedEvents( this, QEvent::LayoutHint );
1868 //#endif //DESKTOP_VERSION 1878 //#endif //DESKTOP_VERSION
1869 setUpdatesEnabled( TRUE ); 1879 setUpdatesEnabled( TRUE );
1870 repaint( TRUE ); 1880 repaint( TRUE );
1871} 1881}
1872 1882
1873void KToolBar::toolBarPosChanged( QToolBar *tb ) 1883void KToolBar::toolBarPosChanged( QToolBar *tb )
1874{ 1884{
1875 if ( tb != this ) 1885 if ( tb != this )
1876 return; 1886 return;
1877//US if ( d->oldPos == DockMinimized ) 1887//US if ( d->oldPos == DockMinimized )
1878 if ( d->oldPos == QMainWindow::Minimized ) 1888 if ( d->oldPos == QMainWindow::Minimized )
1879 rebuildLayout(); 1889 rebuildLayout();
1880 d->oldPos = (QMainWindow::ToolBarDock)barPos(); 1890 d->oldPos = (QMainWindow::ToolBarDock)barPos();
1881/*US 1891/*US
1882 if ( mainWindow() && mainWindow()->inherits( "KMainWindow" ) ) 1892 if ( mainWindow() && mainWindow()->inherits( "KMainWindow" ) )
1883 static_cast<KMainWindow *>(mainWindow())->setSettingsDirty(); 1893 static_cast<KMainWindow *>(mainWindow())->setSettingsDirty();
1884*/ 1894*/
1885} 1895}
1886 1896
1887/*US 1897/*US
1888void KToolBar::loadState( const QDomElement &element ) 1898void KToolBar::loadState( const QDomElement &element )
1889{ 1899{
1890 //kdDebug(220) << "KToolBar::loadState " << this << endl; 1900 //kdDebug(220) << "KToolBar::loadState " << this << endl;
1891 if ( !mainWindow() ) 1901 if ( !mainWindow() )
1892 return; 1902 return;
1893 1903
1894 { 1904 {
1895 QCString text = element.namedItem( "text" ).toElement().text().utf8(); 1905 QCString text = element.namedItem( "text" ).toElement().text().utf8();
1896 if ( text.isEmpty() ) 1906 if ( text.isEmpty() )
1897 text = element.namedItem( "Text" ).toElement().text().utf8(); 1907 text = element.namedItem( "Text" ).toElement().text().utf8();
1898 if ( !text.isEmpty() ) 1908 if ( !text.isEmpty() )
1899 setText( i18n( text ) ); 1909 setText( i18n( text ) );
1900 } 1910 }
1901 1911
1902 { 1912 {
1903 QCString attrFullWidth = element.attribute( "fullWidth" ).lower().latin1(); 1913 QCString attrFullWidth = element.attribute( "fullWidth" ).lower().latin1();
1904 if ( !attrFullWidth.isEmpty() ) 1914 if ( !attrFullWidth.isEmpty() )
1905 setFullSize( attrFullWidth == "true" ); 1915 setFullSize( attrFullWidth == "true" );
1906 } 1916 }
1907 1917
1908 Dock dock = DockTop; 1918 Dock dock = DockTop;
1909 { 1919 {
1910 QCString attrPosition = element.attribute( "position" ).lower().latin1(); 1920 QCString attrPosition = element.attribute( "position" ).lower().latin1();
1911 //kdDebug(220) << "KToolBar::loadState attrPosition=" << attrPosition << endl; 1921 //kdDebug(220) << "KToolBar::loadState attrPosition=" << attrPosition << endl;
1912 if ( !attrPosition.isEmpty() ) { 1922 if ( !attrPosition.isEmpty() ) {
1913 if ( attrPosition == "top" ) 1923 if ( attrPosition == "top" )
1914 dock = DockTop; 1924 dock = DockTop;
1915 else if ( attrPosition == "left" ) 1925 else if ( attrPosition == "left" )
1916 dock = DockLeft; 1926 dock = DockLeft;
1917 else if ( attrPosition == "right" ) 1927 else if ( attrPosition == "right" )
1918 dock = DockRight; 1928 dock = DockRight;
1919 else if ( attrPosition == "bottom" ) 1929 else if ( attrPosition == "bottom" )
1920 dock = DockBottom; 1930 dock = DockBottom;
1921 else if ( attrPosition == "floating" ) 1931 else if ( attrPosition == "floating" )
1922 dock = DockTornOff; 1932 dock = DockTornOff;
1923 else if ( attrPosition == "flat" ) 1933 else if ( attrPosition == "flat" )
1924 dock = DockMinimized; 1934 dock = DockMinimized;
1925 } 1935 }
1926 } 1936 }
1927 1937
1928 { 1938 {
1929 QCString attrIconText = element.attribute( "iconText" ).lower().latin1(); 1939 QCString attrIconText = element.attribute( "iconText" ).lower().latin1();
1930 if ( !attrIconText.isEmpty() ) { 1940 if ( !attrIconText.isEmpty() ) {
1931 //kdDebug(220) << "KToolBar::loadState attrIconText=" << attrIconText << endl; 1941 //kdDebug(220) << "KToolBar::loadState attrIconText=" << attrIconText << endl;
1932 if ( attrIconText == "icontextright" ) 1942 if ( attrIconText == "icontextright" )
1933 setIconText( KToolBar::IconTextRight ); 1943 setIconText( KToolBar::IconTextRight );
1934 else if ( attrIconText == "textonly" ) 1944 else if ( attrIconText == "textonly" )
1935 setIconText( KToolBar::TextOnly ); 1945 setIconText( KToolBar::TextOnly );
1936 else if ( attrIconText == "icontextbottom" ) 1946 else if ( attrIconText == "icontextbottom" )
1937 setIconText( KToolBar::IconTextBottom ); 1947 setIconText( KToolBar::IconTextBottom );
1938 else if ( attrIconText == "icononly" ) 1948 else if ( attrIconText == "icononly" )
1939 setIconText( KToolBar::IconOnly ); 1949 setIconText( KToolBar::IconOnly );
1940 } else 1950 } else
1941 // Use global setting 1951 // Use global setting
1942 setIconText( iconTextSetting() ); 1952 setIconText( iconTextSetting() );
1943 } 1953 }
1944 1954
1945 { 1955 {
1946 QString attrIconSize = element.attribute( "iconSize" ).lower(); 1956 QString attrIconSize = element.attribute( "iconSize" ).lower();
1947 if ( !attrIconSize.isEmpty() ) 1957 if ( !attrIconSize.isEmpty() )
1948 d->IconSizeDefault = attrIconSize.toInt(); 1958 d->IconSizeDefault = attrIconSize.toInt();
1949 setIconSize( d->IconSizeDefault ); 1959 setIconSize( d->IconSizeDefault );
1950 } 1960 }
1951 1961
1952 { 1962 {
1953 QString attrIndex = element.attribute( "index" ).lower(); 1963 QString attrIndex = element.attribute( "index" ).lower();
1954 if ( !attrIndex.isEmpty() ) 1964 if ( !attrIndex.isEmpty() )
1955 d->IndexDefault = attrIndex.toInt(); 1965 d->IndexDefault = attrIndex.toInt();
1956 } 1966 }
1957 1967
1958 { 1968 {
1959 QString attrOffset = element.attribute( "offset" ).lower(); 1969 QString attrOffset = element.attribute( "offset" ).lower();
1960 if ( !attrOffset.isEmpty() ) 1970 if ( !attrOffset.isEmpty() )
1961 d->OffsetDefault = attrOffset.toInt(); 1971 d->OffsetDefault = attrOffset.toInt();
1962 } 1972 }
1963 1973
1964 { 1974 {
1965 QString attrNewLine = element.attribute( "newline" ).lower(); 1975 QString attrNewLine = element.attribute( "newline" ).lower();
1966 if ( !attrNewLine.isEmpty() ) 1976 if ( !attrNewLine.isEmpty() )
1967 d->NewLineDefault = attrNewLine == "true"; 1977 d->NewLineDefault = attrNewLine == "true";
1968 } 1978 }
1969 1979
1970 { 1980 {
1971 QString attrHidden = element.attribute( "hidden" ).lower(); 1981 QString attrHidden = element.attribute( "hidden" ).lower();
1972 if ( !attrHidden.isEmpty() ) 1982 if ( !attrHidden.isEmpty() )
1973 d->HiddenDefault = attrHidden == "true"; 1983 d->HiddenDefault = attrHidden == "true";
1974 } 1984 }
1975 1985
1976 d->toolBarInfo = KToolBarPrivate::ToolBarInfo( dock, d->IndexDefault, d->NewLineDefault, d->OffsetDefault ); 1986 d->toolBarInfo = KToolBarPrivate::ToolBarInfo( dock, d->IndexDefault, d->NewLineDefault, d->OffsetDefault );
1977 mainWindow()->addDockWindow( this, dock, d->NewLineDefault ); 1987 mainWindow()->addDockWindow( this, dock, d->NewLineDefault );
1978//US mainWindow()->moveDockWindow( this, dock, d->NewLineDefault, d->IndexDefault, d->OffsetDefault ); 1988//US mainWindow()->moveDockWindow( this, dock, d->NewLineDefault, d->IndexDefault, d->OffsetDefault );
1979 mainWindow()->moveToolBar( this, dock, d->NewLineDefault, d->IndexDefault, d->OffsetDefault ); 1989 mainWindow()->moveToolBar( this, dock, d->NewLineDefault, d->IndexDefault, d->OffsetDefault );
1980 1990
1981 // Apply the highlight button setting 1991 // Apply the highlight button setting
1982 d->m_highlight = highlightSetting(); 1992 d->m_highlight = highlightSetting();
1983 1993
1984 // Apply transparent-toolbar-moving setting (ok, this is global to the mainwindow, 1994 // Apply transparent-toolbar-moving setting (ok, this is global to the mainwindow,
1985 // but we do it only if there are toolbars...) 1995 // but we do it only if there are toolbars...)
1986 if ( transparentSetting() != !mainWindow()->opaqueMoving() ) 1996 if ( transparentSetting() != !mainWindow()->opaqueMoving() )
1987 mainWindow()->setOpaqueMoving( !transparentSetting() ); 1997 mainWindow()->setOpaqueMoving( !transparentSetting() );
1988 1998
1989 if ( d->HiddenDefault ) 1999 if ( d->HiddenDefault )
1990 hide(); 2000 hide();
1991 else 2001 else
1992 show(); 2002 show();
1993 2003
1994 getAttributes( d->PositionDefault, d->IconTextDefault, d->IndexDefault ); 2004 getAttributes( d->PositionDefault, d->IconTextDefault, d->IndexDefault );
1995} 2005}
1996*/ 2006*/
1997 2007
1998void KToolBar::getAttributes( QString &position, QString &icontext, int &index ) 2008void KToolBar::getAttributes( QString &position, QString &icontext, int &index )
1999{ 2009{
2000 // get all of the stuff to save 2010 // get all of the stuff to save
2001 switch ( barPos() ) { 2011 switch ( barPos() ) {
2002 case KToolBar::Flat: 2012 case KToolBar::Flat:
2003 position = "Flat"; 2013 position = "Flat";
2004 break; 2014 break;
2005 case KToolBar::Bottom: 2015 case KToolBar::Bottom:
2006 position = "Bottom"; 2016 position = "Bottom";
2007 break; 2017 break;
2008 case KToolBar::Left: 2018 case KToolBar::Left:
2009 position = "Left"; 2019 position = "Left";
2010 break; 2020 break;
2011 case KToolBar::Right: 2021 case KToolBar::Right:
2012 position = "Right"; 2022 position = "Right";
2013 break; 2023 break;
2014 case KToolBar::Floating: 2024 case KToolBar::Floating:
2015 position = "Floating"; 2025 position = "Floating";
2016 break; 2026 break;
2017 case KToolBar::Top: 2027 case KToolBar::Top:
2018 default: 2028 default:
2019 position = "Top"; 2029 position = "Top";
2020 break; 2030 break;
2021 } 2031 }
2022 2032
2023 if ( mainWindow() ) { 2033 if ( mainWindow() ) {
2024 QMainWindow::ToolBarDock dock; 2034 QMainWindow::ToolBarDock dock;
2025 bool newLine; 2035 bool newLine;
2026 int offset; 2036 int offset;
2027 mainWindow()->getLocation( this, dock, index, newLine, offset ); 2037 mainWindow()->getLocation( this, dock, index, newLine, offset );
2028 } 2038 }
2029 2039
2030 switch (d->m_iconText) { 2040 switch (d->m_iconText) {
2031 case KToolBar::IconTextRight: 2041 case KToolBar::IconTextRight:
2032 icontext = "IconTextRight"; 2042 icontext = "IconTextRight";
2033 break; 2043 break;
2034 case KToolBar::IconTextBottom: 2044 case KToolBar::IconTextBottom:
2035 icontext = "IconTextBottom"; 2045 icontext = "IconTextBottom";
2036 break; 2046 break;
2037 case KToolBar::TextOnly: 2047 case KToolBar::TextOnly:
2038 icontext = "TextOnly"; 2048 icontext = "TextOnly";
2039 break; 2049 break;
2040 case KToolBar::IconOnly: 2050 case KToolBar::IconOnly:
2041 default: 2051 default:
2042 icontext = "IconOnly"; 2052 icontext = "IconOnly";
2043 break; 2053 break;
2044 } 2054 }
2045} 2055}
2046/*US 2056/*US
2047void KToolBar::saveState( QDomElement &current ) 2057void KToolBar::saveState( QDomElement &current )
2048{ 2058{
2049 QString position, icontext; 2059 QString position, icontext;
2050 int index = -1; 2060 int index = -1;
2051 getAttributes( position, icontext, index ); 2061 getAttributes( position, icontext, index );
2052 2062
2053 current.setAttribute( "noMerge", "1" ); 2063 current.setAttribute( "noMerge", "1" );
2054 current.setAttribute( "position", position ); 2064 current.setAttribute( "position", position );
2055 current.setAttribute( "iconText", icontext ); 2065 current.setAttribute( "iconText", icontext );
2056 current.setAttribute( "index", index ); 2066 current.setAttribute( "index", index );
2057 current.setAttribute( "offset", offset() ); 2067 current.setAttribute( "offset", offset() );
2058 current.setAttribute( "newline", newLine() ); 2068 current.setAttribute( "newline", newLine() );
2059 if ( isHidden() ) 2069 if ( isHidden() )
2060 current.setAttribute( "hidden", "true" ); 2070 current.setAttribute( "hidden", "true" );
2061 d->modified = true; 2071 d->modified = true;
2062} 2072}
2063*/ 2073*/
2064 2074
2065void KToolBar::positionYourself( bool force ) 2075void KToolBar::positionYourself( bool force )
2066{ 2076{
2067 if (force) 2077 if (force)
2068 d->positioned = false; 2078 d->positioned = false;
2069 2079
2070 if ( d->positioned || !mainWindow() ) 2080 if ( d->positioned || !mainWindow() )
2071 { 2081 {
2072 //kdDebug(220) << "KToolBar::positionYourself d->positioned=true ALREADY DONE" << endl; 2082 //kdDebug(220) << "KToolBar::positionYourself d->positioned=true ALREADY DONE" << endl;
2073 return; 2083 return;
2074 } 2084 }
2075 // we can't test for ForceHide after moveDockWindow because QDockArea 2085 // we can't test for ForceHide after moveDockWindow because QDockArea
2076 // does a reparent() with showIt == true 2086 // does a reparent() with showIt == true
2077 bool doHide = isHidden(); 2087 bool doHide = isHidden();
2078 //kdDebug(220) << "positionYourself " << name() << " dock=" << d->toolBarInfo.dock << " newLine=" << d->toolBarInfo.newline << " offset=" << d->toolBarInfo.offset << endl; 2088 //kdDebug(220) << "positionYourself " << name() << " dock=" << d->toolBarInfo.dock << " newLine=" << d->toolBarInfo.newline << " offset=" << d->toolBarInfo.offset << endl;
2079/*US mainWindow()->moveDockWindow( this, d->toolBarInfo.dock, 2089/*US mainWindow()->moveDockWindow( this, d->toolBarInfo.dock,
2080 d->toolBarInfo.newline, 2090 d->toolBarInfo.newline,
2081 d->toolBarInfo.index, 2091 d->toolBarInfo.index,
2082 d->toolBarInfo.offset ); 2092 d->toolBarInfo.offset );
2083*/ 2093*/
2084 mainWindow()->moveToolBar( this, d->toolBarInfo.dock, d->NewLineDefault, d->IndexDefault, d->OffsetDefault ); 2094 mainWindow()->moveToolBar( this, d->toolBarInfo.dock, d->NewLineDefault, d->IndexDefault, d->OffsetDefault );
2085 2095
2086 if ( doHide ) 2096 if ( doHide )
2087 hide(); 2097 hide();
2088 // This method can only have an effect once - unless force is set 2098 // This method can only have an effect once - unless force is set
2089 d->positioned = TRUE; 2099 d->positioned = TRUE;
2090} 2100}
2091 2101
2092//US KPopupMenu *KToolBar::contextMenu() 2102//US KPopupMenu *KToolBar::contextMenu()
2093QPopupMenu *KToolBar::contextMenu() 2103QPopupMenu *KToolBar::contextMenu()
2094{ 2104{
2095 if ( context ) 2105 if ( context )
2096 return context; 2106 return context;
2097 2107
2098 // Construct our context popup menu. Name it qt_dockwidget_internal so it 2108 // Construct our context popup menu. Name it qt_dockwidget_internal so it
2099 // won't be deleted by QToolBar::clear(). 2109 // won't be deleted by QToolBar::clear().
2100//US context = new KPopupMenu( this, "qt_dockwidget_internal" ); 2110//US context = new KPopupMenu( this, "qt_dockwidget_internal" );
2101 context = new QPopupMenu( this, "qt_dockwidget_internal" ); 2111 context = new QPopupMenu( this, "qt_dockwidget_internal" );
2102//US context->insertTitle(i18n("Toolbar Menu")); 2112//US context->insertTitle(i18n("Toolbar Menu"));
2103 2113
2104//US KPopupMenu *orient = new KPopupMenu( context, "orient" ); 2114//US KPopupMenu *orient = new KPopupMenu( context, "orient" );
2105 QPopupMenu *orient = new QPopupMenu( context, "orient" ); 2115 QPopupMenu *orient = new QPopupMenu( context, "orient" );
2106 orient->insertItem( i18n("toolbar position string","Top"), CONTEXT_TOP ); 2116 orient->insertItem( i18n("toolbar position string","Top"), CONTEXT_TOP );
2107 orient->insertItem( i18n("toolbar position string","Left"), CONTEXT_LEFT ); 2117 orient->insertItem( i18n("toolbar position string","Left"), CONTEXT_LEFT );
2108 orient->insertItem( i18n("toolbar position string","Right"), CONTEXT_RIGHT ); 2118 orient->insertItem( i18n("toolbar position string","Right"), CONTEXT_RIGHT );
2109 orient->insertItem( i18n("toolbar position string","Bottom"), CONTEXT_BOTTOM ); 2119 orient->insertItem( i18n("toolbar position string","Bottom"), CONTEXT_BOTTOM );
2110 orient->insertSeparator(-1); 2120 orient->insertSeparator(-1);
2111 //orient->insertItem( i18n("toolbar position string","Floating"), CONTEXT_FLOAT ); 2121 //orient->insertItem( i18n("toolbar position string","Floating"), CONTEXT_FLOAT );
2112 orient->insertItem( i18n("min toolbar", "Flat"), CONTEXT_FLAT ); 2122 orient->insertItem( i18n("min toolbar", "Flat"), CONTEXT_FLAT );
2113 2123
2114//US KPopupMenu *mode = new KPopupMenu( context, "mode" ); 2124//US KPopupMenu *mode = new KPopupMenu( context, "mode" );
2115 QPopupMenu *mode = new QPopupMenu( context, "mode" ); 2125 QPopupMenu *mode = new QPopupMenu( context, "mode" );
2116 mode->insertItem( i18n("Icons Only"), CONTEXT_ICONS ); 2126 mode->insertItem( i18n("Icons Only"), CONTEXT_ICONS );
2117 mode->insertItem( i18n("Text Only"), CONTEXT_TEXT ); 2127 mode->insertItem( i18n("Text Only"), CONTEXT_TEXT );
2118 mode->insertItem( i18n("Text Alongside Icons"), CONTEXT_TEXTRIGHT ); 2128 mode->insertItem( i18n("Text Alongside Icons"), CONTEXT_TEXTRIGHT );
2119 mode->insertItem( i18n("Text Under Icons"), CONTEXT_TEXTUNDER ); 2129 mode->insertItem( i18n("Text Under Icons"), CONTEXT_TEXTUNDER );
2120 2130
2121//US KPopupMenu *size = new KPopupMenu( context, "size" ); 2131//US KPopupMenu *size = new KPopupMenu( context, "size" );
2122 QPopupMenu *size = new QPopupMenu( context, "size" ); 2132 QPopupMenu *size = new QPopupMenu( context, "size" );
2123 size->insertItem( i18n("Default"), CONTEXT_ICONSIZES ); 2133 size->insertItem( i18n("Default"), CONTEXT_ICONSIZES );
2124 // Query the current theme for available sizes 2134 // Query the current theme for available sizes
2125 QValueList<int> avSizes; 2135 QValueList<int> avSizes;
2126/*US 2136/*US
2127 KIconTheme *theme = KGlobal::instance()->iconLoader()->theme(); 2137 KIconTheme *theme = KGlobal::instance()->iconLoader()->theme();
2128 if (!::qstrcmp(QObject::name(), "mainToolBar")) 2138 if (!::qstrcmp(QObject::name(), "mainToolBar"))
2129 avSizes = theme->querySizes( KIcon::MainToolbar); 2139 avSizes = theme->querySizes( KIcon::MainToolbar);
2130 else 2140 else
2131 avSizes = theme->querySizes( KIcon::Toolbar); 2141 avSizes = theme->querySizes( KIcon::Toolbar);
2132*/ 2142*/
2133 avSizes << 16; 2143 avSizes << 16;
2134 avSizes << 32; 2144 avSizes << 32;
2135 2145
2136 d->iconSizes = avSizes; 2146 d->iconSizes = avSizes;
2137 2147
2138 QValueList<int>::Iterator it; 2148 QValueList<int>::Iterator it;
2139 for (it=avSizes.begin(); it!=avSizes.end(); it++) { 2149 for (it=avSizes.begin(); it!=avSizes.end(); it++) {
2140 QString text; 2150 QString text;
2141 if ( *it < 19 ) 2151 if ( *it < 19 )
2142 text = i18n("Small (%1x%2)").arg(*it).arg(*it); 2152 text = i18n("Small (%1x%2)").arg(*it).arg(*it);
2143 else if (*it < 25) 2153 else if (*it < 25)
2144 text = i18n("Medium (%1x%2)").arg(*it).arg(*it); 2154 text = i18n("Medium (%1x%2)").arg(*it).arg(*it);
2145 else 2155 else
2146 text = i18n("Large (%1x%2)").arg(*it).arg(*it); 2156 text = i18n("Large (%1x%2)").arg(*it).arg(*it);
2147 //we use the size as an id, with an offset 2157 //we use the size as an id, with an offset
2148 size->insertItem( text, CONTEXT_ICONSIZES + *it ); 2158 size->insertItem( text, CONTEXT_ICONSIZES + *it );
2149 } 2159 }
2150 2160
2151 context->insertItem( i18n("Orientation"), orient ); 2161 context->insertItem( i18n("Orientation"), orient );
2152 orient->setItemChecked(CONTEXT_TOP, true); 2162 orient->setItemChecked(CONTEXT_TOP, true);
2153 context->insertItem( i18n("Text Position"), mode ); 2163 context->insertItem( i18n("Text Position"), mode );
2154 context->setItemChecked(CONTEXT_ICONS, true); 2164 context->setItemChecked(CONTEXT_ICONS, true);
2155 context->insertItem( i18n("Icon Size"), size ); 2165 context->insertItem( i18n("Icon Size"), size );
2156 2166
2157/*US 2167/*US
2158 if (mainWindow()->inherits("KMainWindow")) 2168 if (mainWindow()->inherits("KMainWindow"))
2159 { 2169 {
2160 if ( (static_cast<KMainWindow*>(mainWindow())->toolBarMenuAction()) && 2170 if ( (static_cast<KMainWindow*>(mainWindow())->toolBarMenuAction()) &&
2161 (static_cast<KMainWindow*>(mainWindow())->hasMenuBar()) ) 2171 (static_cast<KMainWindow*>(mainWindow())->hasMenuBar()) )
2162 2172
2163 (static_cast<KMainWindow*>(mainWindow()))->toolBarMenuAction()->plug(context); 2173 (static_cast<KMainWindow*>(mainWindow()))->toolBarMenuAction()->plug(context);
2164 } 2174 }
2165*/ 2175*/
2166 2176
2167 connect( context, SIGNAL( aboutToShow() ), this, SLOT( slotContextAboutToShow() ) ); 2177 connect( context, SIGNAL( aboutToShow() ), this, SLOT( slotContextAboutToShow() ) );
2168 return context; 2178 return context;
2169} 2179}
2170 2180
2171void KToolBar::slotContextAboutToShow() 2181void KToolBar::slotContextAboutToShow()
2172{ 2182{
2173 if (!d->m_configurePlugged) 2183 if (!d->m_configurePlugged)
2174 { 2184 {
2175 // try to find "configure toolbars" action 2185 // try to find "configure toolbars" action
2176 2186
2177 KXMLGUIClient *xmlGuiClient = d->m_xmlguiClient; 2187 KXMLGUIClient *xmlGuiClient = d->m_xmlguiClient;
2178 if ( !xmlGuiClient && mainWindow() && mainWindow()->inherits( "KMainWindow" ) ) 2188 if ( !xmlGuiClient && mainWindow() && mainWindow()->inherits( "KMainWindow" ) )
2179 xmlGuiClient = (KXMLGUIClient *)mainWindow(); 2189 xmlGuiClient = (KXMLGUIClient *)mainWindow();
2180 if ( xmlGuiClient ) 2190 if ( xmlGuiClient )
2181 { 2191 {
2182 KAction *configureAction = xmlGuiClient->actionCollection()->action(KStdAction::stdName(KStdAction::ConfigureToolbars)); 2192 KAction *configureAction = xmlGuiClient->actionCollection()->action(KStdAction::stdName(KStdAction::ConfigureToolbars));
2183 if ( configureAction ) 2193 if ( configureAction )
2184 { 2194 {
2185 configureAction->plug(context); 2195 configureAction->plug(context);
2186 d->m_configurePlugged = true; 2196 d->m_configurePlugged = true;
2187 } 2197 }
2188 } 2198 }
2189 } 2199 }
2190 2200
2191 for(int i = CONTEXT_ICONS; i <= CONTEXT_TEXTUNDER; ++i) 2201 for(int i = CONTEXT_ICONS; i <= CONTEXT_TEXTUNDER; ++i)
2192 context->setItemChecked(i, false); 2202 context->setItemChecked(i, false);
2193 2203
2194 switch( d->m_iconText ) 2204 switch( d->m_iconText )
2195 { 2205 {
2196 case IconOnly: 2206 case IconOnly:
2197 default: 2207 default:
2198 context->setItemChecked(CONTEXT_ICONS, true); 2208 context->setItemChecked(CONTEXT_ICONS, true);
2199 break; 2209 break;
2200 case IconTextRight: 2210 case IconTextRight:
2201 context->setItemChecked(CONTEXT_TEXTRIGHT, true); 2211 context->setItemChecked(CONTEXT_TEXTRIGHT, true);
2202 break; 2212 break;
2203 case TextOnly: 2213 case TextOnly:
2204 context->setItemChecked(CONTEXT_TEXT, true); 2214 context->setItemChecked(CONTEXT_TEXT, true);
2205 break; 2215 break;
2206 case IconTextBottom: 2216 case IconTextBottom:
2207 context->setItemChecked(CONTEXT_TEXTUNDER, true); 2217 context->setItemChecked(CONTEXT_TEXTUNDER, true);
2208 break; 2218 break;
2209 } 2219 }
2210 2220
2211 QValueList<int>::ConstIterator iIt = d->iconSizes.begin(); 2221 QValueList<int>::ConstIterator iIt = d->iconSizes.begin();
2212 QValueList<int>::ConstIterator iEnd = d->iconSizes.end(); 2222 QValueList<int>::ConstIterator iEnd = d->iconSizes.end();
2213 for (; iIt != iEnd; ++iIt ) 2223 for (; iIt != iEnd; ++iIt )
2214 context->setItemChecked( CONTEXT_ICONSIZES + *iIt, false ); 2224 context->setItemChecked( CONTEXT_ICONSIZES + *iIt, false );
2215 2225
2216 context->setItemChecked( CONTEXT_ICONSIZES, false ); 2226 context->setItemChecked( CONTEXT_ICONSIZES, false );
2217 2227
2218 context->setItemChecked( CONTEXT_ICONSIZES + d->m_iconSize, true ); 2228 context->setItemChecked( CONTEXT_ICONSIZES + d->m_iconSize, true );
2219 2229
2220 for ( int i = CONTEXT_TOP; i <= CONTEXT_FLAT; ++i ) 2230 for ( int i = CONTEXT_TOP; i <= CONTEXT_FLAT; ++i )
2221 context->setItemChecked( i, false ); 2231 context->setItemChecked( i, false );
2222 2232
2223 switch ( barPos() ) 2233 switch ( barPos() )
2224 { 2234 {
2225 case KToolBar::Flat: 2235 case KToolBar::Flat:
2226 context->setItemChecked( CONTEXT_FLAT, true ); 2236 context->setItemChecked( CONTEXT_FLAT, true );
2227 break; 2237 break;
2228 case KToolBar::Bottom: 2238 case KToolBar::Bottom:
2229 context->setItemChecked( CONTEXT_BOTTOM, true ); 2239 context->setItemChecked( CONTEXT_BOTTOM, true );
2230 break; 2240 break;
2231 case KToolBar::Left: 2241 case KToolBar::Left:
2232 context->setItemChecked( CONTEXT_LEFT, true ); 2242 context->setItemChecked( CONTEXT_LEFT, true );
2233 break; 2243 break;
2234 case KToolBar::Right: 2244 case KToolBar::Right:
2235 context->setItemChecked( CONTEXT_RIGHT, true ); 2245 context->setItemChecked( CONTEXT_RIGHT, true );
2236 break; 2246 break;
2237 case KToolBar::Floating: 2247 case KToolBar::Floating:
2238 context->setItemChecked( CONTEXT_FLOAT, true ); 2248 context->setItemChecked( CONTEXT_FLOAT, true );
2239 break; 2249 break;
2240 case KToolBar::Top: 2250 case KToolBar::Top:
2241 context->setItemChecked( CONTEXT_TOP, true ); 2251 context->setItemChecked( CONTEXT_TOP, true );
2242 break; 2252 break;
2243 default: break; 2253 default: break;
2244 } 2254 }
2245} 2255}
2246 2256
2247void KToolBar::widgetDestroyed() 2257void KToolBar::widgetDestroyed()
2248{ 2258{
2249 removeWidgetInternal( (QWidget*)sender() ); 2259 removeWidgetInternal( (QWidget*)sender() );
2250} 2260}
2251 2261
2252void KToolBar::removeWidgetInternal( QWidget * w ) 2262void KToolBar::removeWidgetInternal( QWidget * w )
2253{ 2263{
2254 if ( inshutdownprocess ) 2264 if ( inshutdownprocess )
2255 return; 2265 return;
2256 widgets.removeRef( w ); 2266 widgets.removeRef( w );
2257 QMap< QWidget*, int >::Iterator it = widget2id.find( w ); 2267 QMap< QWidget*, int >::Iterator it = widget2id.find( w );
2258 if ( it == widget2id.end() ) 2268 if ( it == widget2id.end() )
2259 return; 2269 return;
2260 id2widget.remove( *it ); 2270 id2widget.remove( *it );
2261 widget2id.remove( it ); 2271 widget2id.remove( it );
2262} 2272}
2263 2273
2264void KToolBar::virtual_hook( int, void* ) 2274void KToolBar::virtual_hook( int, void* )
2265{ /*BASE::virtual_hook( id, data );*/ } 2275{ /*BASE::virtual_hook( id, data );*/ }
2266 2276
2267//US #include "ktoolbar.moc" 2277//US #include "ktoolbar.moc"
2268 2278
diff --git a/microkde/kdeui/ktoolbar.h b/microkde/kdeui/ktoolbar.h
index 7a5c114..3319fa8 100644
--- a/microkde/kdeui/ktoolbar.h
+++ b/microkde/kdeui/ktoolbar.h
@@ -1,1108 +1,1110 @@
1/* This file is part of the KDE libraries 1/* This file is part of the KDE libraries
2 Copyright (C) 2000 Reginald Stadlbauer (reggie@kde.org) 2 Copyright (C) 2000 Reginald Stadlbauer (reggie@kde.org)
3 (C) 1997, 1998 Stephan Kulow (coolo@kde.org) 3 (C) 1997, 1998 Stephan Kulow (coolo@kde.org)
4 (C) 1997, 1998 Sven Radej (radej@kde.org) 4 (C) 1997, 1998 Sven Radej (radej@kde.org)
5 (C) 1997, 1998 Mark Donohoe (donohoe@kde.org) 5 (C) 1997, 1998 Mark Donohoe (donohoe@kde.org)
6 (C) 1997, 1998 Matthias Ettrich (ettrich@kde.org) 6 (C) 1997, 1998 Matthias Ettrich (ettrich@kde.org)
7 (C) 1999, 2000 Kurt Granroth (granroth@kde.org) 7 (C) 1999, 2000 Kurt Granroth (granroth@kde.org)
8 8
9 This library is free software; you can redistribute it and/or 9 This library is free software; you can redistribute it and/or
10 modify it under the terms of the GNU Library General Public 10 modify it under the terms of the GNU Library General Public
11 License version 2 as published by the Free Software Foundation. 11 License version 2 as published by the Free Software Foundation.
12 12
13 This library is distributed in the hope that it will be useful, 13 This library is distributed in the hope that it will be useful,
14 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 but WITHOUT ANY WARRANTY; without even the implied warranty of
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16 Library General Public License for more details. 16 Library General Public License for more details.
17 17
18 You should have received a copy of the GNU Library General Public License 18 You should have received a copy of the GNU Library General Public License
19 along with this library; see the file COPYING.LIB. If not, write to 19 along with this library; see the file COPYING.LIB. If not, write to
20 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, 20 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
21 Boston, MA 02111-1307, USA. 21 Boston, MA 02111-1307, USA.
22 */ 22 */
23 23
24#ifndef KTOOLBAR_H 24#ifndef KTOOLBAR_H
25#define KTOOLBAR_H 25#define KTOOLBAR_H
26 26
27#ifndef DESKTOP_VERSION 27#ifndef DESKTOP_VERSION
28#define private public 28#define private public
29#include <qtoolbar.h> 29#include <qtoolbar.h>
30#undef private 30#undef private
31#include <qpe/qpetoolbar.h> 31#include <qpe/qpetoolbar.h>
32#else 32#else
33#include <qtoolbar.h> 33#include <qtoolbar.h>
34#endif 34#endif
35 35
36 36
37#include <qmainwindow.h> 37#include <qmainwindow.h>
38#include <qcombobox.h> 38#include <qcombobox.h>
39#include <qmap.h> 39#include <qmap.h>
40#include <qptrlist.h> 40#include <qptrlist.h>
41#include <kglobal.h> 41#include <kglobal.h>
42#include <qguardedptr.h> 42#include <qguardedptr.h>
43#include <qframe.h> 43#include <qframe.h>
44#include <qiconset.h> 44#include <qiconset.h>
45 45
46class QDomElement; 46class QDomElement;
47class QSize; 47class QSize;
48class QPixmap; 48class QPixmap;
49class QPopupMenu; 49class QPopupMenu;
50class QStringList; 50class QStringList;
51class QDomDocument; 51class QDomDocument;
52class QTimer; 52class QTimer;
53 53
54class KLineEdit; 54class KLineEdit;
55class KToolBar; 55class KToolBar;
56class KToolBarButton; 56class KToolBarButton;
57class KToolBoxManager; 57class KToolBoxManager;
58//US class KAnimWidget; 58//US class KAnimWidget;
59//US class KPopupMenu; 59//US class KPopupMenu;
60//US class KInstance; 60//US class KInstance;
61class KComboBox; 61class KComboBox;
62class KXMLGUIClient; 62class KXMLGUIClient;
63 63
64class KToolBarPrivate; 64class KToolBarPrivate;
65 65
66class KToolBarSeparator : public QFrame 66class KToolBarSeparator : public QFrame
67{ 67{
68 Q_OBJECT 68 Q_OBJECT
69public: 69public:
70 KToolBarSeparator( Orientation, bool l, QToolBar *parent, const char* name=0 ); 70 KToolBarSeparator( Orientation, bool l, QToolBar *parent, const char* name=0 );
71 71
72 QSize sizeHint() const; 72 QSize sizeHint() const;
73 Orientation orientation() const { return orient; } 73 Orientation orientation() const { return orient; }
74 QSizePolicy sizePolicy() const; 74 QSizePolicy sizePolicy() const;
75 bool showLine() const { return line; } 75 bool showLine() const { return line; }
76public slots: 76public slots:
77 void setOrientation( Orientation ); 77 void setOrientation( Orientation );
78protected: 78protected:
79 void styleChange( QStyle& ); 79 void styleChange( QStyle& );
80private: 80private:
81 Orientation orient; 81 Orientation orient;
82 bool line; 82 bool line;
83}; 83};
84 84
85 85
86 /** 86 /**
87 * A KDE-style toolbar. 87 * A KDE-style toolbar.
88 * 88 *
89 * KToolBar can be dragged around in and between different docks. 89 * KToolBar can be dragged around in and between different docks.
90 * 90 *
91 * A KToolBar can contain all sorts of widgets. 91 * A KToolBar can contain all sorts of widgets.
92 * 92 *
93 * KToolBar can be used as a standalone widget, but @ref KMainWindow 93 * KToolBar can be used as a standalone widget, but @ref KMainWindow
94 * provides easy factories and management of one or more toolbars. 94 * provides easy factories and management of one or more toolbars.
95 * Once you have a KToolBar object, you can insert items into it with the 95 * Once you have a KToolBar object, you can insert items into it with the
96 * insert... methods, or remove them with the @ref removeItem() method. This 96 * insert... methods, or remove them with the @ref removeItem() method. This
97 * can be done at any time; the toolbar will be automatically updated. 97 * can be done at any time; the toolbar will be automatically updated.
98 * There are also many methods to set per-child properties like alignment 98 * There are also many methods to set per-child properties like alignment
99 * and toggle behaviour. 99 * and toggle behaviour.
100 * 100 *
101 * KToolBar uses a global config group to load toolbar settings on 101 * KToolBar uses a global config group to load toolbar settings on
102 * construction. It will reread this config group on a 102 * construction. It will reread this config group on a
103 * @ref KApplication::appearanceChanged() signal. 103 * @ref KApplication::appearanceChanged() signal.
104 * 104 *
105 * @short Floatable toolbar with auto resize. 105 * @short Floatable toolbar with auto resize.
106 * @version $Id$ 106 * @version $Id$
107 * @author Reginald Stadlbauer <reggie@kde.org>, Stephan Kulow <coolo@kde.org>, Sven Radej <radej@kde.org>. 107 * @author Reginald Stadlbauer <reggie@kde.org>, Stephan Kulow <coolo@kde.org>, Sven Radej <radej@kde.org>.
108 */ 108 */
109 109
110// strange things are happening ... so I have to use strange define methods ... 110// strange things are happening ... so I have to use strange define methods ...
111// porting KToolBar back to Qt2 really needs some strange hacks 111// porting KToolBar back to Qt2 really needs some strange hacks
112 112
113#ifndef DESKTOP_VERSION 113#ifndef DESKTOP_VERSION
114#define QToolBar QPEToolBar 114#define QToolBar QPEToolBar
115#endif 115#endif
116 116
117 class KToolBar : public QToolBar 117 class KToolBar : public QToolBar
118{ 118{
119 Q_OBJECT 119 Q_OBJECT
120 120
121 121
122 Q_ENUMS( IconText BarPosition ) 122 Q_ENUMS( IconText BarPosition )
123 123
124 Q_PROPERTY( IconText iconText READ iconText WRITE setIconText ) 124 Q_PROPERTY( IconText iconText READ iconText WRITE setIconText )
125 Q_PROPERTY( BarPosition barPos READ barPos WRITE setBarPos ) 125 Q_PROPERTY( BarPosition barPos READ barPos WRITE setBarPos )
126 Q_PROPERTY( bool fullSize READ fullSize WRITE setFullSize ) 126 Q_PROPERTY( bool fullSize READ fullSize WRITE setFullSize )
127 Q_PROPERTY( int iconSize READ iconSize WRITE setIconSize ) 127 Q_PROPERTY( int iconSize READ iconSize WRITE setIconSize )
128 Q_PROPERTY( QString text READ text WRITE setText ) 128 Q_PROPERTY( QString text READ text WRITE setText )
129#ifndef DESKTOP_VERSION 129#ifndef DESKTOP_VERSION
130#undef QToolBar 130#undef QToolBar
131#endif 131#endif
132public: 132public:
133 enum IconText{IconOnly = 0, IconTextRight, TextOnly, IconTextBottom}; 133 enum IconText{IconOnly = 0, IconTextRight, TextOnly, IconTextBottom};
134 /** 134 /**
135 * The state of the status bar. 135 * The state of the status bar.
136 * @deprecated 136 * @deprecated
137 **/ 137 **/
138 enum BarStatus{Toggle, Show, Hide}; 138 enum BarStatus{Toggle, Show, Hide};
139 /** 139 /**
140 * Possible bar positions. 140 * Possible bar positions.
141 **/ 141 **/
142 enum BarPosition{ Unmanaged, Floating, Top, Bottom, Right, Left, Flat}; 142 enum BarPosition{ Unmanaged, Floating, Top, Bottom, Right, Left, Flat};
143 143
144 /** 144 /**
145 * Constructor. 145 * Constructor.
146 * This constructor is used by the XML-GUI. If you use it, you need 146 * This constructor is used by the XML-GUI. If you use it, you need
147 * to call QMainWindow::addToolBar to specify the position of the toolbar. 147 * to call QMainWindow::addToolBar to specify the position of the toolbar.
148 * So it's simpler to use the other constructor. 148 * So it's simpler to use the other constructor.
149 * 149 *
150 * The toolbar will read in various global config settings for 150 * The toolbar will read in various global config settings for
151 * things like icon size and text position, etc. However, some of 151 * things like icon size and text position, etc. However, some of
152 * the settings will be honored only if @ref #_honor_mode is set to 152 * the settings will be honored only if @ref #_honor_mode is set to
153 * true. All other toolbars will be IconOnly and use Medium icons. 153 * true. All other toolbars will be IconOnly and use Medium icons.
154 * 154 *
155 * @param parent The standard toolbar parent (usually a 155 * @param parent The standard toolbar parent (usually a
156 * @ref KMainWindow) 156 * @ref KMainWindow)
157 * @param name The standard internal name 157 * @param name The standard internal name
158 * @param honor_style If true, then global settings for IconSize and IconText will be honored 158 * @param honor_style If true, then global settings for IconSize and IconText will be honored
159 * @param readConfig whether to apply the configuration (global and application-specific) 159 * @param readConfig whether to apply the configuration (global and application-specific)
160 */ 160 */
161 KToolBar( QWidget *parent, const char *name = 0, bool honor_style = FALSE, bool readConfig = TRUE ); 161 KToolBar( QWidget *parent, const char *name = 0, bool honor_style = FALSE, bool readConfig = TRUE );
162 162
163 /** 163 /**
164 * Constructor for non-XML-GUI applications. 164 * Constructor for non-XML-GUI applications.
165 * 165 *
166 * The toolbar will read in various global config settings for 166 * The toolbar will read in various global config settings for
167 * things like icon size and text position, etc. However, some of 167 * things like icon size and text position, etc. However, some of
168 * the settings will be honored only if @ref #_honor_mode is set to 168 * the settings will be honored only if @ref #_honor_mode is set to
169 * true. All other toolbars will be IconOnly and use Medium icons. 169 * true. All other toolbars will be IconOnly and use Medium icons.
170 * 170 *
171 * @param parentWindow The window that should be the parent of this toolbar 171 * @param parentWindow The window that should be the parent of this toolbar
172 * @param dock The position of the toolbar. Usually QMainWindow::Top. 172 * @param dock The position of the toolbar. Usually QMainWindow::Top.
173 * @param newLine If true, start a new line in the dock for this toolbar. 173 * @param newLine If true, start a new line in the dock for this toolbar.
174 * @param name The standard internal name 174 * @param name The standard internal name
175 * @param honor_style If true, then global settings for IconSize and IconText will be honored 175 * @param honor_style If true, then global settings for IconSize and IconText will be honored
176 * @param readConfig whether to apply the configuration (global and application-specific) 176 * @param readConfig whether to apply the configuration (global and application-specific)
177 */ 177 */
178 KToolBar( QMainWindow *parentWindow, QMainWindow::ToolBarDock dock /*= QMainWindow::Top*/, bool newLine = false, 178 KToolBar( QMainWindow *parentWindow, QMainWindow::ToolBarDock dock /*= QMainWindow::Top*/, bool newLine = false,
179 const char *name = 0, bool honor_style = FALSE, bool readConfig = TRUE ); 179 const char *name = 0, bool honor_style = FALSE, bool readConfig = TRUE );
180 180
181 /** 181 /**
182 * Constructor for non-XML-GUI applications. 182 * Constructor for non-XML-GUI applications.
183 * 183 *
184 * The toolbar will read in various global config settings for 184 * The toolbar will read in various global config settings for
185 * things like icon size and text position, etc. However, some of 185 * things like icon size and text position, etc. However, some of
186 * the settings will be honored only if @ref #_honor_mode is set to 186 * the settings will be honored only if @ref #_honor_mode is set to
187 * true. All other toolbars will be IconOnly and use Medium icons. 187 * true. All other toolbars will be IconOnly and use Medium icons.
188 * 188 *
189 * @param parentWindow The window that should be the parent of this toolbar 189 * @param parentWindow The window that should be the parent of this toolbar
190 * @param dock Another widget than the mainwindow to dock toolbar to. 190 * @param dock Another widget than the mainwindow to dock toolbar to.
191 * @param newLine If true, start a new line in the dock for this toolbar. 191 * @param newLine If true, start a new line in the dock for this toolbar.
192 * @param name The standard internal name 192 * @param name The standard internal name
193 * @param honor_style If true, then global settings for IconSize and IconText will be honored 193 * @param honor_style If true, then global settings for IconSize and IconText will be honored
194 * @param readConfig whether to apply the configuration (global and application-specific) 194 * @param readConfig whether to apply the configuration (global and application-specific)
195 */ 195 */
196 KToolBar( QMainWindow *parentWindow, QWidget *dock, bool newLine = false, 196 KToolBar( QMainWindow *parentWindow, QWidget *dock, bool newLine = false,
197 const char *name = 0, bool honor_style = FALSE, bool readConfig = TRUE ); 197 const char *name = 0, bool honor_style = FALSE, bool readConfig = TRUE );
198 198
199 virtual ~KToolBar(); 199 virtual ~KToolBar();
200 200
201 /** 201 /**
202 * Insert a button (a @ref KToolBarButton) with a pixmap. The 202 * Insert a button (a @ref KToolBarButton) with a pixmap. The
203 * pixmap is loaded by the button itself based on the global icon 203 * pixmap is loaded by the button itself based on the global icon
204 * settings. 204 * settings.
205 * 205 *
206 * You should connect to one or more signals in KToolBar: 206 * You should connect to one or more signals in KToolBar:
207 * @ref clicked() , @ref pressed() , @ref released() , or 207 * @ref clicked() , @ref pressed() , @ref released() , or
208 * @ref highlighted() and if the button is a toggle button 208 * @ref highlighted() and if the button is a toggle button
209 * (@ref setToggle() ) @ref toggled() . Those signals have @p id 209 * (@ref setToggle() ) @ref toggled() . Those signals have @p id
210 * of a button that caused the signal. If you want to bind a popup 210 * of a button that caused the signal. If you want to bind a popup
211 * to button, see @ref setButton(). 211 * to button, see @ref setButton().
212 * 212 *
213 * @param icon The name of the icon to use as the active pixmap 213 * @param icon The name of the icon to use as the active pixmap
214 * @param id The id of this button 214 * @param id The id of this button
215 * @param enabled Enable or disable the button at startup 215 * @param enabled Enable or disable the button at startup
216 * @param text The tooltip or toolbar text (depending on state) 216 * @param text The tooltip or toolbar text (depending on state)
217 * @param index The position of the button. (-1 = at end). 217 * @param index The position of the button. (-1 = at end).
218 * 218 *
219 * @return The item index. 219 * @return The item index.
220 */ 220 */
221 int insertButton(const QString& icon, int id, bool enabled = true, 221 int insertButton(const QString& icon, int id, bool enabled = true,
222 const QString& text = QString::null, int index=-1/*US , 222 const QString& text = QString::null, int index=-1/*US ,
223 KInstance *_instance = KGlobal::instance()*/); 223 KInstance *_instance = KGlobal::instance()*/);
224 224
225 /** 225 /**
226 * This is the same as above, but with specified signals and 226 * This is the same as above, but with specified signals and
227 * slots to which this button will be connected. 227 * slots to which this button will be connected.
228 * 228 *
229 * You can add more signals with @ref addConnection(). 229 * You can add more signals with @ref addConnection().
230 * 230 *
231 * @param icon The name of the icon to use as the active pixmap 231 * @param icon The name of the icon to use as the active pixmap
232 * @param id The id of this button 232 * @param id The id of this button
233 * @param signal The signal to connect to 233 * @param signal The signal to connect to
234 * @param receiver The slot's parent 234 * @param receiver The slot's parent
235 * @param enabled Enable or disable the button at startup 235 * @param enabled Enable or disable the button at startup
236 * @param text The tooltip or toolbar text (depending on state) 236 * @param text The tooltip or toolbar text (depending on state)
237 * @param index The position of the button. (-1 = at end). 237 * @param index The position of the button. (-1 = at end).
238 * 238 *
239 * @return The item index. 239 * @return The item index.
240 */ 240 */
241 int insertButton(const QString& icon, int id, const char *signal, 241 int insertButton(const QString& icon, int id, const char *signal,
242 const QObject *receiver, const char *slot, 242 const QObject *receiver, const char *slot,
243 bool enabled = true, const QString& text = QString::null, 243 bool enabled = true, const QString& text = QString::null,
244 int index=-1/*US, KInstance *_instance = KGlobal::instance()*/ ); 244 int index=-1/*US, KInstance *_instance = KGlobal::instance()*/ );
245 245
246 /** 246 /**
247 * Inserts a button (a @ref KToolBarButton) with the specified 247 * Inserts a button (a @ref KToolBarButton) with the specified
248 * pixmap. This pixmap will be used as the "active" one and the 248 * pixmap. This pixmap will be used as the "active" one and the
249 * disabled and default ones will be autogenerated. 249 * disabled and default ones will be autogenerated.
250 * 250 *
251 * It is recommended that you use the insertButton function that 251 * It is recommended that you use the insertButton function that
252 * allows you to specify the icon name rather then the pixmap 252 * allows you to specify the icon name rather then the pixmap
253 * itself. Specifying the icon name is much more flexible. 253 * itself. Specifying the icon name is much more flexible.
254 * 254 *
255 * You should connect to one or more signals in KToolBar: 255 * You should connect to one or more signals in KToolBar:
256 * @ref clicked() , @ref pressed() , @ref released() , or 256 * @ref clicked() , @ref pressed() , @ref released() , or
257 * @ref highlighted() and if the button is a toggle button 257 * @ref highlighted() and if the button is a toggle button
258 * (@ref setToggle() ) @ref toggled() . Those signals have @p id 258 * (@ref setToggle() ) @ref toggled() . Those signals have @p id
259 * of a button that caused the signal. If you want to bind a popup 259 * of a button that caused the signal. If you want to bind a popup
260 * to button, see @ref setButton(). 260 * to button, see @ref setButton().
261 * 261 *
262 * @param pixmap The active pixmap 262 * @param pixmap The active pixmap
263 * @param id The id of this button 263 * @param id The id of this button
264 * @param enabled Enable or disable the button at startup 264 * @param enabled Enable or disable the button at startup
265 * @param text The tooltip or toolbar text (depending on state) 265 * @param text The tooltip or toolbar text (depending on state)
266 * @param index The position of the button. (-1 = at end). 266 * @param index The position of the button. (-1 = at end).
267 * 267 *
268 * @return The item index. 268 * @return The item index.
269 */ 269 */
270 int insertButton(const QPixmap& pixmap, int id, bool enabled = true, 270 int insertButton(const QPixmap& pixmap, int id, bool enabled = true,
271 const QString& text = QString::null, int index=-1 ); 271 const QString& text = QString::null, int index=-1 );
272 272
273 /** 273 /**
274 * This is the same as above, but with specified signals and 274 * This is the same as above, but with specified signals and
275 * slots to which this button will be connected. 275 * slots to which this button will be connected.
276 * 276 *
277 * You can add more signals with @ref addConnection(). 277 * You can add more signals with @ref addConnection().
278 * 278 *
279 * @param icon The name of the icon to use as the active pixmap 279 * @param icon The name of the icon to use as the active pixmap
280 * @param id The id of this button 280 * @param id The id of this button
281 * @param signal The signal to connect to 281 * @param signal The signal to connect to
282 * @param receiver The slot's parent 282 * @param receiver The slot's parent
283 * @param enabled Enable or disable the button at startup 283 * @param enabled Enable or disable the button at startup
284 * @param text The tooltip or toolbar text (depending on state) 284 * @param text The tooltip or toolbar text (depending on state)
285 * @param index The position of the button. (-1 = at end). 285 * @param index The position of the button. (-1 = at end).
286 * 286 *
287 * @return The item index. 287 * @return The item index.
288 */ 288 */
289 int insertButton(const QPixmap& pixmap, int id, const char *signal, 289 int insertButton(const QPixmap& pixmap, int id, const char *signal,
290 const QObject *receiver, const char *slot, 290 const QObject *receiver, const char *slot,
291 bool enabled = true, const QString& text = QString::null, 291 bool enabled = true, const QString& text = QString::null,
292 int index=-1 ); 292 int index=-1 );
293 293
294 /** 294 /**
295 * Inserts a button with popupmenu. 295 * Inserts a button with popupmenu.
296 * 296 *
297 * Button will have small 297 * Button will have small
298 * triangle. You have to connect to popup's signals. The 298 * triangle. You have to connect to popup's signals. The
299 * signals @ref KButton::pressed(), @ref KButton::released(), 299 * signals @ref KButton::pressed(), @ref KButton::released(),
300 * @ref KButton::clicked() or @ref KButton::doubleClicked() are @p not 300 * @ref KButton::clicked() or @ref KButton::doubleClicked() are @p not
301 * emmited by 301 * emmited by
302 * this button (see @ref setDelayedPopup() for that). 302 * this button (see @ref setDelayedPopup() for that).
303 * You can add custom popups which inherit @ref QPopupMenu to get popups 303 * You can add custom popups which inherit @ref QPopupMenu to get popups
304 * with tables, drawings etc. Just don't fiddle with events there. 304 * with tables, drawings etc. Just don't fiddle with events there.
305 */ 305 */
306 int insertButton(const QString& icon, int id, QPopupMenu *popup, 306 int insertButton(const QString& icon, int id, QPopupMenu *popup,
307 bool enabled, const QString&_text, int index=-1); 307 bool enabled, const QString&_text, int index=-1);
308 308
309 /** 309 /**
310 * Inserts a button with popupmenu. 310 * Inserts a button with popupmenu.
311 * 311 *
312 * Button will have small 312 * Button will have small
313 * triangle. You have to connect to popup's signals. The 313 * triangle. You have to connect to popup's signals. The
314 * signals @ref KButton::pressed(), @ref KButton::released(), 314 * signals @ref KButton::pressed(), @ref KButton::released(),
315 * @ref KButton::clicked() or @ref KButton::doubleClicked() are @p not 315 * @ref KButton::clicked() or @ref KButton::doubleClicked() are @p not
316 * emmited by 316 * emmited by
317 * this button (see @ref setDelayedPopup() for that). 317 * this button (see @ref setDelayedPopup() for that).
318 * You can add custom popups which inherit @ref QPopupMenu to get popups 318 * You can add custom popups which inherit @ref QPopupMenu to get popups
319 * with tables, drawings etc. Just don't fiddle with events there. 319 * with tables, drawings etc. Just don't fiddle with events there.
320 */ 320 */
321 int insertButton(const QPixmap& pixmap, int id, QPopupMenu *popup, 321 int insertButton(const QPixmap& pixmap, int id, QPopupMenu *popup,
322 bool enabled, const QString&_text, int index=-1); 322 bool enabled, const QString&_text, int index=-1);
323 323
324 /** 324 /**
325 * Inserts a @ref KLineEdit. You have to specify signals and slots to 325 * Inserts a @ref KLineEdit. You have to specify signals and slots to
326 * which KLineEdit will be connected. KLineEdit has all slots QLineEdit 326 * which KLineEdit will be connected. KLineEdit has all slots QLineEdit
327 * has, plus signals @ref KLineEdit::completion and @ref KLineEdit::textRotation 327 * has, plus signals @ref KLineEdit::completion and @ref KLineEdit::textRotation
328 * KLineEdit can be set to autoresize itself to full free width 328 * KLineEdit can be set to autoresize itself to full free width
329 * in toolbar, that is to last right aligned item. For that, 329 * in toolbar, that is to last right aligned item. For that,
330 * toolbar must be set to full width (which it is by default). 330 * toolbar must be set to full width (which it is by default).
331 * @see setFullWidth() 331 * @see setFullWidth()
332 * @see setItemAutoSized() 332 * @see setItemAutoSized()
333 * @see KLineEdit 333 * @see KLineEdit
334 * @return Item index. 334 * @return Item index.
335 */ 335 */
336 int insertLined (const QString& text, int id, 336 int insertLined (const QString& text, int id,
337 const char *signal, 337 const char *signal,
338 const QObject *receiver, const char *slot, 338 const QObject *receiver, const char *slot,
339 bool enabled = true, 339 bool enabled = true,
340 const QString& toolTipText = QString::null, 340 const QString& toolTipText = QString::null,
341 int size = 70, int index =-1); 341 int size = 70, int index =-1);
342 342
343 /** 343 /**
344 * Inserts a @ref KComboBox with list. 344 * Inserts a @ref KComboBox with list.
345 * 345 *
346 * Can be writable, but cannot contain 346 * Can be writable, but cannot contain
347 * pixmaps. By default inserting policy is AtBottom, i.e. typed items 347 * pixmaps. By default inserting policy is AtBottom, i.e. typed items
348 * are placed at the bottom of the list. Can be autosized. If the size 348 * are placed at the bottom of the list. Can be autosized. If the size
349 * argument is specified as -1, the width of the combobox is automatically 349 * argument is specified as -1, the width of the combobox is automatically
350 * computed. 350 * computed.
351 * 351 *
352 * @see setFullWidth() 352 * @see setFullWidth()
353 * @see setItemAutoSized() 353 * @see setItemAutoSized()
354 * @see KComboBox 354 * @see KComboBox
355 * @return Item index. 355 * @return Item index.
356 */ 356 */
357 int insertCombo (const QStringList &list, int id, bool writable, 357 int insertCombo (const QStringList &list, int id, bool writable,
358 const char *signal, const QObject *receiver, 358 const char *signal, const QObject *receiver,
359 const char *slot, bool enabled=true, 359 const char *slot, bool enabled=true,
360 const QString& tooltiptext=QString::null, 360 const QString& tooltiptext=QString::null,
361 int size=70, int index=-1, 361 int size=70, int index=-1,
362 QComboBox::Policy policy = QComboBox::AtBottom); 362 QComboBox::Policy policy = QComboBox::AtBottom);
363 363
364 /** 364 /**
365 * Insert a @ref KComboBox with text. 365 * Insert a @ref KComboBox with text.
366 * 366 *
367 * The rest is the same as above. 367 * The rest is the same as above.
368 * @see setItemAutoSized() 368 * @see setItemAutoSized()
369 * 369 *
370 * @see KComboBox 370 * @see KComboBox
371 * @return Item index. 371 * @return Item index.
372 */ 372 */
373 int insertCombo (const QString& text, int id, bool writable, 373 int insertCombo (const QString& text, int id, bool writable,
374 const char *signal, QObject *recevier, 374 const char *signal, QObject *recevier,
375 const char *slot, bool enabled=true, 375 const char *slot, bool enabled=true,
376 const QString& tooltiptext=QString::null, 376 const QString& tooltiptext=QString::null,
377 int size=70, int index=-1, 377 int size=70, int index=-1,
378 QComboBox::Policy policy = QComboBox::AtBottom); 378 QComboBox::Policy policy = QComboBox::AtBottom);
379 379
380 /** 380 /**
381 * Inserts a separator into the toolbar with the given id. 381 * Inserts a separator into the toolbar with the given id.
382 * Returns the separator's index 382 * Returns the separator's index
383 */ 383 */
384 int insertSeparator( int index = -1, int id = -1 ); 384 int insertSeparator( int index = -1, int id = -1 );
385 385
386 /** 386 /**
387 * Inserts a line separator into the toolbar with the given id. 387 * Inserts a line separator into the toolbar with the given id.
388 * Returns the separator's index 388 * Returns the separator's index
389 */ 389 */
390 int insertLineSeparator( int index = -1, int id = -1 ); 390 int insertLineSeparator( int index = -1, int id = -1 );
391 391
392 /** 392 /**
393 * Inserts a user-defined widget. The widget @p must have this 393 * Inserts a user-defined widget. The widget @p must have this
394 * toolbar as its parent. 394 * toolbar as its parent.
395 * 395 *
396 * Widget must have a QWidget for base class. Widget can be 396 * Widget must have a QWidget for base class. Widget can be
397 * autosized to full width. If you forget about it, you can get a 397 * autosized to full width. If you forget about it, you can get a
398 * pointer to this widget with @ref getWidget(). 398 * pointer to this widget with @ref getWidget().
399 * @see setItemAutoSized() 399 * @see setItemAutoSized()
400 * @return Item index. 400 * @return Item index.
401 */ 401 */
402 int insertWidget(int id, int width, QWidget *_widget, int index=-1); 402 int insertWidget(int id, int width, QWidget *_widget, int index=-1);
403 403
404 /** 404 /**
405 * Inserts an animated widget. A @ref KAnimWidget will be created 405 * Inserts an animated widget. A @ref KAnimWidget will be created
406 * internally using the icon name you provide. 406 * internally using the icon name you provide.
407 * This will emit a signal (clicked()) whenever the 407 * This will emit a signal (clicked()) whenever the
408 * animation widget is clicked. 408 * animation widget is clicked.
409 * 409 *
410 * @see animatedWidget() 410 * @see animatedWidget()
411 * 411 *
412 * @param id The id for this toolbar item 412 * @param id The id for this toolbar item
413 * @param receiver The parent of your slot 413 * @param receiver The parent of your slot
414 * @param slot The slot to receive the clicked() signal 414 * @param slot The slot to receive the clicked() signal
415 * @param icons The name of the animation icon group to use 415 * @param icons The name of the animation icon group to use
416 * @param index The item index 416 * @param index The item index
417 * 417 *
418 * @return The item index 418 * @return The item index
419 */ 419 */
420/*US 420/*US
421 int insertAnimatedWidget(int id, QObject *receiver, const char *slot, 421 int insertAnimatedWidget(int id, QObject *receiver, const char *slot,
422 const QString& icons, int index = -1); 422 const QString& icons, int index = -1);
423*/ 423*/
424 /** 424 /**
425 * This will return a pointer to the given animated widget, if it 425 * This will return a pointer to the given animated widget, if it
426 * exists. 426 * exists.
427 * 427 *
428 * @see insertAnimatedWidget 428 * @see insertAnimatedWidget
429 * 429 *
430 * @param id The id for the widget you want to get a pointer to 430 * @param id The id for the widget you want to get a pointer to
431 * 431 *
432 * @return A pointer to the current animated widget or 0L 432 * @return A pointer to the current animated widget or 0L
433 */ 433 */
434//US KAnimWidget *animatedWidget( int id ); 434//US KAnimWidget *animatedWidget( int id );
435 435
436 /** 436 /**
437 * Adds connections to items. 437 * Adds connections to items.
438 * 438 *
439 * It is important that you 439 * It is important that you
440 * know the @p id of particular item. Nothing happens if you forget @p id. 440 * know the @p id of particular item. Nothing happens if you forget @p id.
441 */ 441 */
442 void addConnection (int id, const char *signal, 442 void addConnection (int id, const char *signal,
443 const QObject *receiver, const char *slot); 443 const QObject *receiver, const char *slot);
444 /** 444 /**
445 * Enables/disables item. 445 * Enables/disables item.
446 */ 446 */
447 void setItemEnabled( int id, bool enabled ); 447 void setItemEnabled( int id, bool enabled );
448 448
449 /** 449 /**
450 * Sets the icon for a button. 450 * Sets the icon for a button.
451 * 451 *
452 * Can be used while button is visible. 452 * Can be used while button is visible.
453 */ 453 */
454 void setButtonIcon( int id, const QString& _icon ); 454 void setButtonIcon( int id, const QString& _icon );
455 455
456 /** 456 /**
457 * Sets button pixmap. 457 * Sets button pixmap.
458 * 458 *
459 * Can be used while button is visible. 459 * Can be used while button is visible.
460 */ 460 */
461 void setButtonPixmap( int id, const QPixmap& _pixmap ); 461 void setButtonPixmap( int id, const QPixmap& _pixmap );
462 462
463 /** 463 /**
464 * Sets a button icon from a QIconSet. 464 * Sets a button icon from a QIconSet.
465 * 465 *
466 * Can be used while button is visible. 466 * Can be used while button is visible.
467 */ 467 */
468 void setButtonIconSet( int id, const QIconSet& iconset ); 468 void setButtonIconSet( int id, const QIconSet& iconset );
469 469
470 /** 470 /**
471 * Sets a delayed popup for a button. 471 * Sets a delayed popup for a button.
472 * 472 *
473 * Delayed popup is what you see in 473 * Delayed popup is what you see in
474 * Netscape Navigator's Previous and Next buttons: If you click them you 474 * Netscape Navigator's Previous and Next buttons: If you click them you
475 * go back 475 * go back
476 * or forth. If you press them long enough, you get a history-menu. 476 * or forth. If you press them long enough, you get a history-menu.
477 * This is exactly what we do here. 477 * This is exactly what we do here.
478 * 478 *
479 * You will insert normal a button with connection (or use signals from 479 * You will insert normal a button with connection (or use signals from
480 * toolbar): 480 * toolbar):
481 * <pre> 481 * <pre>
482 * bar->insertButton(icon, id, SIGNAL(clicked ()), this, 482 * bar->insertButton(icon, id, SIGNAL(clicked ()), this,
483 * SLOT (slotClick()), true, "click or wait for popup"); 483 * SLOT (slotClick()), true, "click or wait for popup");
484 * </pre> And then add a delayed popup: 484 * </pre> And then add a delayed popup:
485 * <pre> 485 * <pre>
486 * bar->setDelayedPopup (id, historyPopup); </pre> 486 * bar->setDelayedPopup (id, historyPopup); </pre>
487 * 487 *
488 * Don't add delayed popups to buttons which have normal popups. 488 * Don't add delayed popups to buttons which have normal popups.
489 * 489 *
490 * You may add popups which are derived from @ref QPopupMenu. You may 490 * You may add popups which are derived from @ref QPopupMenu. You may
491 * add popups that are already in the menu bar or are submenus of 491 * add popups that are already in the menu bar or are submenus of
492 * other popups. 492 * other popups.
493 */ 493 */
494 void setDelayedPopup (int id , QPopupMenu *_popup, bool toggle = false); 494 void setDelayedPopup (int id , QPopupMenu *_popup, bool toggle = false);
495 495
496 /** 496 /**
497 * Turns a button into an autorepeat button. 497 * Turns a button into an autorepeat button.
498 * 498 *
499 * Toggle buttons, buttons with menus, or 499 * Toggle buttons, buttons with menus, or
500 * buttons with delayed menus cannot be made into autorepeat buttons. 500 * buttons with delayed menus cannot be made into autorepeat buttons.
501 * Moreover, you can and will receive 501 * Moreover, you can and will receive
502 * only the signal clicked(), but not pressed() or released(). 502 * only the signal clicked(), but not pressed() or released().
503 * When the user presses this button, you will receive the signal clicked(), 503 * When the user presses this button, you will receive the signal clicked(),
504 * and if the button is still pressed after some time, 504 * and if the button is still pressed after some time,
505 * you will receive more clicked() signals separated by regular 505 * you will receive more clicked() signals separated by regular
506 * intervals. Since this uses @ref QButton::setAutoRepeat() , 506 * intervals. Since this uses @ref QButton::setAutoRepeat() ,
507 * I can't quantify 'some'. 507 * I can't quantify 'some'.
508 */ 508 */
509 void setAutoRepeat (int id, bool flag=true); 509 void setAutoRepeat (int id, bool flag=true);
510 510
511 511
512 /** 512 /**
513 * Turns button into a toggle button if @p flag is true. 513 * Turns button into a toggle button if @p flag is true.
514 */ 514 */
515 void setToggle (int id, bool flag = true); 515 void setToggle (int id, bool flag = true);
516 516
517 /** 517 /**
518 * Toggles a togglebutton. 518 * Toggles a togglebutton.
519 * 519 *
520 * If the button is a toggle button (see @ref setToggle()) 520 * If the button is a toggle button (see @ref setToggle())
521 * the button state will be toggled. This will also cause the toolbar to 521 * the button state will be toggled. This will also cause the toolbar to
522 * emit the signal @ref KButton::toggled() with parameter @p id. You must connect to 522 * emit the signal @ref KButton::toggled() with parameter @p id. You must connect to
523 * this signal, or use @ref addConnection() to connect directly to the 523 * this signal, or use @ref addConnection() to connect directly to the
524 * button signal @ref KButton::toggled(). 524 * button signal @ref KButton::toggled().
525 */ 525 */
526 void toggleButton (int id); 526 void toggleButton (int id);
527 527
528 /** 528 /**
529 * Sets a toggle button state. 529 * Sets a toggle button state.
530 * 530 *
531 * If the button is a toggle button (see @ref setToggle()) 531 * If the button is a toggle button (see @ref setToggle())
532 * this will set its state flag. This will also emit the signal 532 * this will set its state flag. This will also emit the signal
533 * @ref KButton::toggled(). 533 * @ref KButton::toggled().
534 * 534 *
535 * @see setToggle() 535 * @see setToggle()
536 */ 536 */
537 void setButton (int id, bool flag); 537 void setButton (int id, bool flag);
538 538
539 /** 539 /**
540 * @return @p true if button is on, @p false if button is off or if the 540 * @return @p true if button is on, @p false if button is off or if the
541 * button is not a toggle button. 541 * button is not a toggle button.
542 * @see setToggle() 542 * @see setToggle()
543 */ 543 */
544 bool isButtonOn (int id) const; 544 bool isButtonOn (int id) const;
545 545
546 /** 546 /**
547 * Sets the text of a line editor. 547 * Sets the text of a line editor.
548 * 548 *
549 * Cursor is set at end of text. 549 * Cursor is set at end of text.
550 */ 550 */
551 void setLinedText (int id, const QString& text); 551 void setLinedText (int id, const QString& text);
552 552
553 /** 553 /**
554 * Returns a line editor text. 554 * Returns a line editor text.
555 */ 555 */
556 QString getLinedText (int id) const; 556 QString getLinedText (int id) const;
557 557
558 /** 558 /**
559 * Inserts @p text in combobox @p id at position @p index. 559 * Inserts @p text in combobox @p id at position @p index.
560 */ 560 */
561 void insertComboItem (int id, const QString& text, int index); 561 void insertComboItem (int id, const QString& text, int index);
562 562
563 /** 563 /**
564 * Inserts @p list in combobox @p id at position @p index. 564 * Inserts @p list in combobox @p id at position @p index.
565 */ 565 */
566 void insertComboList (int id, const QStringList &list, int index); 566 void insertComboList (int id, const QStringList &list, int index);
567 567
568 /** 568 /**
569 * Removes item @p index from combobox @p id. 569 * Removes item @p index from combobox @p id.
570 */ 570 */
571 void removeComboItem (int id, int index); 571 void removeComboItem (int id, int index);
572 572
573 /** 573 /**
574 * Sets item @p index to be current item in combobox @p id. 574 * Sets item @p index to be current item in combobox @p id.
575 */ 575 */
576 void setCurrentComboItem (int id, int index); 576 void setCurrentComboItem (int id, int index);
577 577
578 /** 578 /**
579 * Changes item @p index in combobox @p id to text. 579 * Changes item @p index in combobox @p id to text.
580 * 580 *
581 * @p index = -1 refers current item (one displayed in the button). 581 * @p index = -1 refers current item (one displayed in the button).
582 */ 582 */
583 void changeComboItem (int id, const QString& text, int index=-1); 583 void changeComboItem (int id, const QString& text, int index=-1);
584 584
585 /** 585 /**
586 * Clears the combobox @p id. 586 * Clears the combobox @p id.
587 * 587 *
588 * Does not delete it or hide it. 588 * Does not delete it or hide it.
589 */ 589 */
590 void clearCombo (int id); 590 void clearCombo (int id);
591 591
592 /** 592 /**
593 * Returns text of item @p index from combobox @p id. 593 * Returns text of item @p index from combobox @p id.
594 * 594 *
595 * @p index = -1 refers to current item. 595 * @p index = -1 refers to current item.
596 */ 596 */
597 597
598 QString getComboItem (int id, int index=-1) const; 598 QString getComboItem (int id, int index=-1) const;
599 599
600 /** 600 /**
601 * Returns a pointer to the combobox. 601 * Returns a pointer to the combobox.
602 * 602 *
603 * Example: 603 * Example:
604 * <pre> 604 * <pre>
605 * KComboBox *combo = toolbar->getCombo(combo_id); 605 * KComboBox *combo = toolbar->getCombo(combo_id);
606 * </pre> 606 * </pre>
607 * That way you can get access to other public methods 607 * That way you can get access to other public methods
608 * that @ref KComboBox provides. 608 * that @ref KComboBox provides.
609 */ 609 */
610 KComboBox * getCombo(int id); 610 KComboBox * getCombo(int id);
611 611
612 /** 612 /**
613 * Returns a pointer to KToolBarLined. 613 * Returns a pointer to KToolBarLined.
614 * 614 *
615 * Example: 615 * Example:
616 * <pre> 616 * <pre>
617 * KLineEdit * lined = toolbar->getKToolBarLined(lined_id); 617 * KLineEdit * lined = toolbar->getKToolBarLined(lined_id);
618 * </pre> 618 * </pre>
619 * That way you can get access to other public methods 619 * That way you can get access to other public methods
620 * that @ref KLineEdit provides. @ref KLineEdit is the same thing 620 * that @ref KLineEdit provides. @ref KLineEdit is the same thing
621 * as @ref QLineEdit plus completion signals. 621 * as @ref QLineEdit plus completion signals.
622 */ 622 */
623 KLineEdit * getLined (int id); 623 KLineEdit * getLined (int id);
624 624
625 /** 625 /**
626 * Returns a pointer to KToolBarButton. 626 * Returns a pointer to KToolBarButton.
627 * 627 *
628 * Example: 628 * Example:
629 * <pre> 629 * <pre>
630 * KToolBarButton * button = toolbar->getButton(button_id); 630 * KToolBarButton * button = toolbar->getButton(button_id);
631 * </pre> 631 * </pre>
632 * That way you can get access to other public methods 632 * That way you can get access to other public methods
633 * that @ref KToolBarButton provides. 633 * that @ref KToolBarButton provides.
634 * 634 *
635 * Using this method is not recommended. 635 * Using this method is not recommended.
636 */ 636 */
637 KToolBarButton * getButton (int id); 637 KToolBarButton * getButton (int id);
638 638
639 /** 639 /**
640 * Align item to the right. 640 * Align item to the right.
641 * 641 *
642 * This works only if toolbar is set to full width. 642 * This works only if toolbar is set to full width.
643 * @see setFullWidth() 643 * @see setFullWidth()
644 */ 644 */
645 void alignItemRight (int id, bool right = true); 645 void alignItemRight (int id, bool right = true);
646 646
647 /** 647 /**
648 * Returns a pointer to an inserted widget. 648 * Returns a pointer to an inserted widget.
649 * 649 *
650 * Wrong ids are not tested. 650 * Wrong ids are not tested.
651 * You can do with this whatever you want, 651 * You can do with this whatever you want,
652 * except change its height (hardcoded). If you change its width 652 * except change its height (hardcoded). If you change its width
653 * you will probably have to call QToolBar::updateRects(true) 653 * you will probably have to call QToolBar::updateRects(true)
654 * @see QWidget 654 * @see QWidget
655 * @see updateRects() 655 * @see updateRects()
656 * 656 *
657 * KDE4: make this const! 657 * KDE4: make this const!
658 */ 658 */
659 QWidget *getWidget (int id); 659 QWidget *getWidget (int id);
660 660
661 /** 661 /**
662 * Set item autosized. 662 * Set item autosized.
663 * 663 *
664 * This works only if the toolbar is set to full width. 664 * This works only if the toolbar is set to full width.
665 * Only @p one item can be autosized, and it has to be 665 * Only @p one item can be autosized, and it has to be
666 * the last left-aligned item. Items that come after this must be right 666 * the last left-aligned item. Items that come after this must be right
667 * aligned. Items that can be right aligned are Lineds, Frames, Widgets and 667 * aligned. Items that can be right aligned are Lineds, Frames, Widgets and
668 * Combos. An autosized item will resize itself whenever the toolbar geometry 668 * Combos. An autosized item will resize itself whenever the toolbar geometry
669 * changes to the last right-aligned item (or to end of toolbar if there 669 * changes to the last right-aligned item (or to end of toolbar if there
670 * are no right-aligned items.) 670 * are no right-aligned items.)
671 * @see setFullWidth() 671 * @see setFullWidth()
672 * @see alignItemRight() 672 * @see alignItemRight()
673 */ 673 */
674 void setItemAutoSized (int id, bool yes = true); 674 void setItemAutoSized (int id, bool yes = true);
675 675
676 /** 676 /**
677 * Remove all items. 677 * Remove all items.
678 * 678 *
679 * The toolbar is redrawn after it. 679 * The toolbar is redrawn after it.
680 */ 680 */
681 void clear (); 681 void clear ();
682 682
683 /** 683 /**
684 * Remove item @p id. 684 * Remove item @p id.
685 * 685 *
686 * Item is deleted. Toolbar is redrawn after it. 686 * Item is deleted. Toolbar is redrawn after it.
687 */ 687 */
688 void removeItem (int id); 688 void removeItem (int id);
689 689
690 /** 690 /**
691 * Remove item @p id. 691 * Remove item @p id.
692 * 692 *
693 * Item is deleted when toolbar is redrawn. 693 * Item is deleted when toolbar is redrawn.
694 */ 694 */
695 void removeItemDelayed (int id); 695 void removeItemDelayed (int id);
696 696
697 /** 697 /**
698 * Hide item. 698 * Hide item.
699 */ 699 */
700 void hideItem (int id); 700 void hideItem (int id);
701 701
702 /** 702 /**
703 * Show item. 703 * Show item.
704 */ 704 */
705 void showItem (int id); 705 void showItem (int id);
706 706
707 /** 707 /**
708 * Returns the index of the given item. 708 * Returns the index of the given item.
709 * 709 *
710 * KDE4: make this const! 710 * KDE4: make this const!
711 */ 711 */
712 int itemIndex (int id); 712 int itemIndex (int id);
713 713
714 /** 714 /**
715 * Set toolbar to full parent size (default). 715 * Set toolbar to full parent size (default).
716 * 716 *
717 * In full size mode the bar 717 * In full size mode the bar
718 * extends over the parent's full width or height. If the mode is disabled 718 * extends over the parent's full width or height. If the mode is disabled
719 * the toolbar tries to take as much space as it needs without wrapping, but 719 * the toolbar tries to take as much space as it needs without wrapping, but
720 * it does not exceed the parent box. You can force a certain width or 720 * it does not exceed the parent box. You can force a certain width or
721 * height with @ref setMaxWidth() or @ref setMaxHeight(). 721 * height with @ref setMaxWidth() or @ref setMaxHeight().
722 * 722 *
723 * If you want to use right-aligned items or auto-sized items you must use 723 * If you want to use right-aligned items or auto-sized items you must use
724 * full size mode. 724 * full size mode.
725 */ 725 */
726 void setFullSize(bool flag = true); 726 void setFullSize(bool flag = true);
727 727
728 /** 728 /**
729 * @return @p true if the full-size mode is enabled. Otherwise 729 * @return @p true if the full-size mode is enabled. Otherwise
730 * it returns @false. 730 * it returns @false.
731 */ 731 */
732 bool fullSize() const; 732 bool fullSize() const;
733 733
734 /** 734 /**
735 * @deprecated use setMovingEnabled(bool) instead. 735 * @deprecated use setMovingEnabled(bool) instead.
736 * Enable or disable moving of toolbar. 736 * Enable or disable moving of toolbar.
737 */ 737 */
738 void enableMoving(bool flag = true); 738 void enableMoving(bool flag = true);
739 739
740 /** 740 /**
741 * Set position of toolbar. 741 * Set position of toolbar.
742 * @see BarPosition() 742 * @see BarPosition()
743 */ 743 */
744 void setBarPos (BarPosition bpos); 744 void setBarPos (BarPosition bpos);
745 745
746 /** 746 /**
747 * Returns position of toolbar. 747 * Returns position of toolbar.
748 */ 748 */
749 const BarPosition barPos(); 749 const BarPosition barPos();
750 750
751 /** 751 /**
752 * @deprecated 752 * @deprecated
753 * Show, hide, or toggle toolbar. 753 * Show, hide, or toggle toolbar.
754 * 754 *
755 * This method is provided for compatibility only, 755 * This method is provided for compatibility only,
756 * please use show() and/or hide() instead. 756 * please use show() and/or hide() instead.
757 * @see BarStatus 757 * @see BarStatus
758 */ 758 */
759 bool enable(BarStatus stat); 759 bool enable(BarStatus stat);
760 760
761 /** 761 /**
762 * @deprecated 762 * @deprecated
763 * Use setMaximumHeight() instead. 763 * Use setMaximumHeight() instead.
764 */ 764 */
765 void setMaxHeight (int h); // Set max height for vertical toolbars 765 void setMaxHeight (int h); // Set max height for vertical toolbars
766 766
767 /** 767 /**
768 * @deprecated 768 * @deprecated
769 * Use maximumHeight() instead. 769 * Use maximumHeight() instead.
770 * Returns the value that was set with @ref setMaxHeight(). 770 * Returns the value that was set with @ref setMaxHeight().
771 */ 771 */
772 int maxHeight(); 772 int maxHeight();
773 773
774 /** 774 /**
775 * @deprecated 775 * @deprecated
776 * Use setMaximumWidth() instead. 776 * Use setMaximumWidth() instead.
777 * Set maximal width of horizontal (top or bottom) toolbar. 777 * Set maximal width of horizontal (top or bottom) toolbar.
778 */ 778 */
779 void setMaxWidth (int dw); 779 void setMaxWidth (int dw);
780 780
781 /** 781 /**
782 * @deprecated 782 * @deprecated
783 * Use maximumWidth() instead. 783 * Use maximumWidth() instead.
784 * Returns the value that was set with @ref setMaxWidth(). 784 * Returns the value that was set with @ref setMaxWidth().
785 */ 785 */
786 int maxWidth(); 786 int maxWidth();
787 787
788 /** 788 /**
789 * Set title for toolbar when it floats. 789 * Set title for toolbar when it floats.
790 * 790 *
791 * Titles are however not (yet) 791 * Titles are however not (yet)
792 * visible. You can't change toolbar's title while it's floating. 792 * visible. You can't change toolbar's title while it's floating.
793 */ 793 */
794 void setTitle (const QString& _title); 794 void setTitle (const QString& _title);
795 795
796 /** 796 /**
797 * @deprecated 797 * @deprecated
798 * Use enableMoving() instead. 798 * Use enableMoving() instead.
799 */ 799 */
800 void enableFloating (bool arrrrrrgh); 800 void enableFloating (bool arrrrrrgh);
801 801
802 /** 802 /**
803 * Set the kind of painting for buttons. 803 * Set the kind of painting for buttons.
804 * 804 *
805 * Choose from: 805 * Choose from:
806 * @li IconOnly (only icons), 806 * @li IconOnly (only icons),
807 * @li IconTextRight (icon and text, text is left from icons), 807 * @li IconTextRight (icon and text, text is left from icons),
808 * @li TextOnly (only text), 808 * @li TextOnly (only text),
809 * @li IconTextBottom (icons and text, text is under icons). 809 * @li IconTextBottom (icons and text, text is under icons).
810 * @see IconText 810 * @see IconText
811 * 811 *
812 */ 812 */
813 void setIconText(IconText it); 813 void setIconText(IconText it);
814 // Note: don't merge with the next one, it breaks Qt properties 814 // Note: don't merge with the next one, it breaks Qt properties
815 815
816 /** 816 /**
817 * Similar to @ref setIconText(IconText it) but allows you to 817 * Similar to @ref setIconText(IconText it) but allows you to
818 * disable or enable updating. If @p update is false, then the 818 * disable or enable updating. If @p update is false, then the
819 * buttons will not be updated. This is useful only if you know 819 * buttons will not be updated. This is useful only if you know
820 * that you will be forcing an update later. 820 * that you will be forcing an update later.
821 */ 821 */
822 void setIconText(IconText it, bool update); 822 void setIconText(IconText it, bool update);
823 823
824 /** 824 /**
825 * @return The current text style for buttons. 825 * @return The current text style for buttons.
826 */ 826 */
827 IconText iconText() const; 827 IconText iconText() const;
828 828
829 /** 829 /**
830 * Set the icon size to load. Usually you should not call 830 * Set the icon size to load. Usually you should not call
831 * this, the icon size is taken care of by KIconLoader 831 * this, the icon size is taken care of by KIconLoader
832 * and globally configured. 832 * and globally configured.
833 * By default, the toolbar will load icons of size 32 for main 833 * By default, the toolbar will load icons of size 32 for main
834 * toolbars and 22 for other toolbars 834 * toolbars and 22 for other toolbars
835 * @see KIconLoader. 835 * @see KIconLoader.
836 * 836 *
837 * @param size The size to use 837 * @param size The size to use
838 */ 838 */
839 void setIconSize(int size); 839 void setIconSize(int size);
840 // Note: don't merge with the next one, it breaks Qt properties 840 // Note: don't merge with the next one, it breaks Qt properties
841 841
842 /** 842 /**
843 * Same as @ref setIconText(int size) but allows you 843 * Same as @ref setIconText(int size) but allows you
844 * to disable the toolbar update. 844 * to disable the toolbar update.
845 * 845 *
846 * @param size The size to use 846 * @param size The size to use
847 * @param update If true, then the toolbar will be updated after 847 * @param update If true, then the toolbar will be updated after
848 * this 848 * this
849 */ 849 */
850 void setIconSize(int size, bool update); 850 void setIconSize(int size, bool update);
851 851
852 /** 852 /**
853 * @return The current icon size for buttons. 853 * @return The current icon size for buttons.
854 */ 854 */
855 int iconSize() const; 855 int iconSize() const;
856 856
857 /** 857 /**
858 * This allows you to enable or disable the context menu. 858 * This allows you to enable or disable the context menu.
859 * 859 *
860 * @param enable If false, then the context menu will be disabled 860 * @param enable If false, then the context menu will be disabled
861 */ 861 */
862 void setEnableContextMenu(bool enable = true); 862 void setEnableContextMenu(bool enable = true);
863 863
864 /** 864 /**
865 * Returns whether or not the context menu is disabled 865 * Returns whether or not the context menu is disabled
866 * 866 *
867 * @return The context menu state 867 * @return The context menu state
868 */ 868 */
869 bool contextMenuEnabled() const; 869 bool contextMenuEnabled() const;
870 870
871 /** 871 /**
872 * This will inform a toolbar button to ignore certain style 872 * This will inform a toolbar button to ignore certain style
873 * changes. Specifically, it will ignore IconText (always IconOnly) 873 * changes. Specifically, it will ignore IconText (always IconOnly)
874 * and will not allow image effects to apply. 874 * and will not allow image effects to apply.
875 * 875 *
876 * @param id The button to exclude from styles 876 * @param id The button to exclude from styles
877 * @param no_style If true, then it is excluded (default: true). 877 * @param no_style If true, then it is excluded (default: true).
878 */ 878 */
879 void setItemNoStyle(int id, bool no_style = true); 879 void setItemNoStyle(int id, bool no_style = true);
880 880
881 void setFlat (bool flag); 881 void setFlat (bool flag);
882 882
883 /** 883 /**
884 * @return the number of items in the toolbar 884 * @return the number of items in the toolbar
885 */ 885 */
886 int count() const; 886 int count() const;
887 887
888 /** 888 /**
889 * Instruct the toolbar to save it's current state to either the app 889 * Instruct the toolbar to save it's current state to either the app
890 * config file or to the XML-GUI resource file (whichever has 890 * config file or to the XML-GUI resource file (whichever has
891 * precedence). 891 * precedence).
892 */ 892 */
893 void saveState(); 893 void saveState();
894 894
895 /** 895 /**
896 * Save the toolbar settings to group @p configGroup in @p config. 896 * Save the toolbar settings to group @p configGroup in @p config.
897 */ 897 */
898 void saveSettings(KConfig *config, const QString &configGroup); 898 void saveSettings(KConfig *config, const QString &configGroup);
899 899
900 /** 900 /**
901 * Read the toolbar settings from group @p configGroup in @p config 901 * Read the toolbar settings from group @p configGroup in @p config
902 * and apply them. 902 * and apply them.
903 */ 903 */
904 void applySettings(KConfig *config, const QString &configGroup); 904 void applySettings(KConfig *config, const QString &configGroup);
905 905
906 /** 906 /**
907 * Tell the toolbar what XML-GUI resource file it should use to save 907 * Tell the toolbar what XML-GUI resource file it should use to save
908 * it's state. The state of the toolbar (position, size, etc) is 908 * it's state. The state of the toolbar (position, size, etc) is
909 * saved in KConfig files if the application does not use XML-GUI.. 909 * saved in KConfig files if the application does not use XML-GUI..
910 * but if the app does, then it's saved the XML file. This function 910 * but if the app does, then it's saved the XML file. This function
911 * allows this to happen. 911 * allows this to happen.
912 * 912 *
913 * @param xmlfile The XML-GUI resource file to write to 913 * @param xmlfile The XML-GUI resource file to write to
914 * @param xml The DOM document for the XML-GUI building 914 * @param xml The DOM document for the XML-GUI building
915 */ 915 */
916 // void setXML(const QString& xmlfile, const QDomDocument& xml); 916 // void setXML(const QString& xmlfile, const QDomDocument& xml);
917 /* @internal */ 917 /* @internal */
918 void setXMLGUIClient( KXMLGUIClient *client ); 918 void setXMLGUIClient( KXMLGUIClient *client );
919 919
920 /** 920 /**
921 * Assign a (translated) text to this toolbar. This is used 921 * Assign a (translated) text to this toolbar. This is used
922 * for the tooltip on the handle, and when listing the toolbars. 922 * for the tooltip on the handle, and when listing the toolbars.
923 */ 923 */
924 void setText( const QString & txt ); 924 void setText( const QString & txt );
925 925
926 /** 926 /**
927 * @return the toolbar's text. 927 * @return the toolbar's text.
928 */ 928 */
929 QString text() const; 929 QString text() const;
930 930
931 void setStretchableWidget( QWidget *w ); 931 void setStretchableWidget( QWidget *w );
932 QSizePolicy sizePolicy() const; 932 QSizePolicy sizePolicy() const;
933 bool highlight() const; 933 bool highlight() const;
934 QSize sizeHint() const; 934 QSize sizeHint() const;
935 QSize minimumSizeHint() const; 935 QSize minimumSizeHint() const;
936 QSize minimumSize() const; 936 QSize minimumSize() const;
937 937
938 void hide(); 938 void hide();
939 void show(); 939 void show();
940 940
941 void updateRects( bool = FALSE ) {} 941 void updateRects( bool = FALSE ) {}
942 942
943//US void loadState( const QDomElement &e ); 943//US void loadState( const QDomElement &e );
944//US void saveState( QDomElement &e ); 944//US void saveState( QDomElement &e );
945 945
946 /** 946 /**
947 * @internal 947 * @internal
948 */ 948 */
949 void positionYourself( bool force = false); 949 void positionYourself( bool force = false);
950 950
951signals: 951signals:
952 /** 952 /**
953 * Emitted when button @p id is clicked. 953 * Emitted when button @p id is clicked.
954 */ 954 */
955 void clicked(int id); 955 void clicked(int id);
956 956
957 /** 957 /**
958 * Emitted when button @p id is double-clicked. 958 * Emitted when button @p id is double-clicked.
959 * 959 *
960 * Note: you will always 960 * Note: you will always
961 * recive two @ref clicked() , @ref pressed() and @ref released() signals. 961 * recive two @ref clicked() , @ref pressed() and @ref released() signals.
962 * There is no way to avoid it - at least no easy way. 962 * There is no way to avoid it - at least no easy way.
963 * If you need to resolve this all you can do is set up timers 963 * If you need to resolve this all you can do is set up timers
964 * which wait for @ref QApplication::doubleClickInterval() to expire. 964 * which wait for @ref QApplication::doubleClickInterval() to expire.
965 * If in that time you don't get this signal, you may belive that 965 * If in that time you don't get this signal, you may belive that
966 * button was only clicked and not double-clicked. 966 * button was only clicked and not double-clicked.
967 * And please note that butons with popup menus do not emit this signal, 967 * And please note that butons with popup menus do not emit this signal,
968 * but those with delayed popup do. 968 * but those with delayed popup do.
969 */ 969 */
970 void doubleClicked (int id); 970 void doubleClicked (int id);
971 971
972 /** 972 /**
973 * Emitted when button @p id is pressed. 973 * Emitted when button @p id is pressed.
974 */ 974 */
975 void pressed(int); 975 void pressed(int);
976 976
977 /** 977 /**
978 * Emits when button @p id is released. 978 * Emits when button @p id is released.
979 */ 979 */
980 void released(int); 980 void released(int);
981 981
982 /** 982 /**
983 * Emitted when a toggle button changes state. 983 * Emitted when a toggle button changes state.
984 * 984 *
985 * Emitted also if you change state 985 * Emitted also if you change state
986 * with @ref setButton() or @ref toggleButton() 986 * with @ref setButton() or @ref toggleButton()
987 * If you make a button normal again, with 987 * If you make a button normal again, with
988 * setToggle(false), this signal won't 988 * setToggle(false), this signal won't
989 * be emitted. 989 * be emitted.
990 */ 990 */
991 void toggled(int); 991 void toggled(int);
992 992
993 /** 993 /**
994 * This signal is emitted when item id gets highlighted/unhighlighted 994 * This signal is emitted when item id gets highlighted/unhighlighted
995 * (i.e when mouse enters/exits). 995 * (i.e when mouse enters/exits).
996 * 996 *
997 * Note that this signal is emitted from 997 * Note that this signal is emitted from
998 * all buttons (normal, disabled and toggle) even when there is no visible 998 * all buttons (normal, disabled and toggle) even when there is no visible
999 * change in buttons (i.e., buttons do not raise when mouse enters). 999 * change in buttons (i.e., buttons do not raise when mouse enters).
1000 * The parameter @p isHighlighted is @p true when mouse enters and @p false when 1000 * The parameter @p isHighlighted is @p true when mouse enters and @p false when
1001 * mouse exits. 1001 * mouse exits.
1002 */ 1002 */
1003 void highlighted(int id, bool isHighlighted); 1003 void highlighted(int id, bool isHighlighted);
1004 1004
1005 /** 1005 /**
1006 * This signal is emitted when item id gets highlighted/unhighlighted 1006 * This signal is emitted when item id gets highlighted/unhighlighted
1007 * (i.e when mouse enters/exits). 1007 * (i.e when mouse enters/exits).
1008 * 1008 *
1009 * Note that this signal is emitted from 1009 * Note that this signal is emitted from
1010 * all buttons (normal, disabled and toggle) even when there is no visible 1010 * all buttons (normal, disabled and toggle) even when there is no visible
1011 * change in buttons (i.e., buttons do not raise when mouse enters). 1011 * change in buttons (i.e., buttons do not raise when mouse enters).
1012 */ 1012 */
1013 void highlighted(int id ); 1013 void highlighted(int id );
1014 1014
1015 /** 1015 /**
1016 * Emitted when toolbar changes position, or when 1016 * Emitted when toolbar changes position, or when
1017 * an item is removed from toolbar. 1017 * an item is removed from toolbar.
1018 * 1018 *
1019 * If you subclass @ref KMainWindow and reimplement 1019 * If you subclass @ref KMainWindow and reimplement
1020 * @ref KMainWindow::resizeEvent() be sure to connect to 1020 * @ref KMainWindow::resizeEvent() be sure to connect to
1021 * this signal. Note: You can connect this signal to a slot that 1021 * this signal. Note: You can connect this signal to a slot that
1022 * doesn't take parameter. 1022 * doesn't take parameter.
1023 */ 1023 */
1024 void moved( BarPosition ); 1024 void moved( BarPosition );
1025 1025
1026 /** 1026 /**
1027 * @internal 1027 * @internal
1028 * This signal is emitted when toolbar detects changing of 1028 * This signal is emitted when toolbar detects changing of
1029 * following parameters: 1029 * following parameters:
1030 * highlighting, button-size, button-mode. This signal is 1030 * highlighting, button-size, button-mode. This signal is
1031 * internal, aimed to buttons. 1031 * internal, aimed to buttons.
1032 */ 1032 */
1033 void modechange (); 1033 void modechange ();
1034 1034
1035 /** 1035 /**
1036 * This signal is emitted when the toolbar is getting deleted, 1036 * This signal is emitted when the toolbar is getting deleted,
1037 * and before ~KToolbar finishes (so it's still time to remove 1037 * and before ~KToolbar finishes (so it's still time to remove
1038 * widgets from the toolbar). 1038 * widgets from the toolbar).
1039 * Used by KWidgetAction. 1039 * Used by KWidgetAction.
1040 * @since 3.2 1040 * @since 3.2
1041 */ 1041 */
1042 void toolbarDestroyed(); 1042 void toolbarDestroyed();
1043 1043
1044public: 1044public:
1045 /** 1045 /**
1046 * @return global setting for "Highlight buttons under mouse" 1046 * @return global setting for "Highlight buttons under mouse"
1047 */ 1047 */
1048 void repaintMe(); 1048 void repaintMe();
1049 static bool highlightSetting(); 1049 static bool highlightSetting();
1050 1050
1051 /** 1051 /**
1052 * @return global setting for "Toolbars transparent when moving" 1052 * @return global setting for "Toolbars transparent when moving"
1053 */ 1053 */
1054 static bool transparentSetting(); 1054 static bool transparentSetting();
1055 1055
1056 /** 1056 /**
1057 * @return global setting for "Icon Text" 1057 * @return global setting for "Icon Text"
1058 */ 1058 */
1059 static IconText iconTextSetting(); 1059 static IconText iconTextSetting();
1060 1060
1061public slots: 1061public slots:
1062 virtual void setIconText( const QString &txt ) 1062 virtual void setIconText( const QString &txt )
1063 { QToolBar::setIconText( txt ); } 1063 { QToolBar::setIconText( txt ); }
1064 void slotRepaint(); 1064 void slotRepaint();
1065 1065
1066protected: 1066protected:
1067 void mousePressEvent( QMouseEvent * ); 1067 void mousePressEvent( QMouseEvent * );
1068 void childEvent( QChildEvent *e ); 1068 void childEvent( QChildEvent *e );
1069 void showEvent( QShowEvent *e ); 1069 void showEvent( QShowEvent *e );
1070 void resizeEvent( QResizeEvent *e ); 1070 void resizeEvent( QResizeEvent *e );
1071 bool event( QEvent *e ); 1071 bool event( QEvent *e );
1072 void applyAppearanceSettings(KConfig *config, const QString &_configGroup, bool forceGlobal = false); 1072 void applyAppearanceSettings(KConfig *config, const QString &_configGroup, bool forceGlobal = false);
1073 QString settingsGroup(); 1073 QString settingsGroup();
1074 1074
1075private slots: 1075private slots:
1076 void rebuildLayout(); 1076 void rebuildLayout();
1077 void slotReadConfig (); 1077 void slotReadConfig ();
1078 void slotAppearanceChanged(); 1078 void slotAppearanceChanged();
1079 void slotIconChanged(int); 1079 void slotIconChanged(int);
1080 void toolBarPosChanged( QToolBar *tb ); 1080 void toolBarPosChanged( QToolBar *tb );
1081 void slotContextAboutToShow(); 1081 void slotContextAboutToShow();
1082 void widgetDestroyed(); 1082 void widgetDestroyed();
1083 1083
1084private: 1084private:
1085 int sizeHintW;
1086 int sizeHintH;
1085 void init( bool readConfig = true, bool honorStyle = false ); 1087 void init( bool readConfig = true, bool honorStyle = false );
1086 void doConnections( KToolBarButton *button ); 1088 void doConnections( KToolBarButton *button );
1087 void insertWidgetInternal( QWidget *w, int &index, int id ); 1089 void insertWidgetInternal( QWidget *w, int &index, int id );
1088 void removeWidgetInternal( QWidget *w ); 1090 void removeWidgetInternal( QWidget *w );
1089 void getAttributes( QString &position, QString &icontext, int &index ); 1091 void getAttributes( QString &position, QString &icontext, int &index );
1090//US KPopupMenu *contextMenu(); 1092//US KPopupMenu *contextMenu();
1091 QPopupMenu *contextMenu(); 1093 QPopupMenu *contextMenu();
1092 1094
1093 QMap<QWidget*, int > widget2id; 1095 QMap<QWidget*, int > widget2id;
1094 typedef QMap<int, QWidget* > Id2WidgetMap; 1096 typedef QMap<int, QWidget* > Id2WidgetMap;
1095 Id2WidgetMap id2widget; 1097 Id2WidgetMap id2widget;
1096//US KPopupMenu *context; 1098//US KPopupMenu *context;
1097 QPopupMenu *context; 1099 QPopupMenu *context;
1098 QPtrList<QWidget> widgets; 1100 QPtrList<QWidget> widgets;
1099 QTimer *layoutTimer; 1101 QTimer *layoutTimer;
1100 QGuardedPtr<QWidget> stretchableWidget, rightAligned; 1102 QGuardedPtr<QWidget> stretchableWidget, rightAligned;
1101protected: 1103protected:
1102 virtual void virtual_hook( int id, void* data ); 1104 virtual void virtual_hook( int id, void* data );
1103private: 1105private:
1104 KToolBarPrivate *d; 1106 KToolBarPrivate *d;
1105 bool inshutdownprocess; 1107 bool inshutdownprocess;
1106}; 1108};
1107 1109
1108#endif 1110#endif