summaryrefslogtreecommitdiff
authorsandman <sandman>2002-12-22 16:37:07 (UTC)
committer sandman <sandman>2002-12-22 16:37:07 (UTC)
commit150e066a847e8e10848cfd10a635b9cec57347b3 (patch) (unidiff)
tree8e16dec1950321db67455b0011b79fcae0469c68
parent9ee5295d934e0876dfe0b7e0a4ee05012c491f91 (diff)
downloadopie-150e066a847e8e10848cfd10a635b9cec57347b3.zip
opie-150e066a847e8e10848cfd10a635b9cec57347b3.tar.gz
opie-150e066a847e8e10848cfd10a635b9cec57347b3.tar.bz2
Fixed some window captions to match the corresponding launcher icons
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/appearance2/appearance.cpp2
-rw-r--r--noncore/settings/language/languagesettingsbase.ui2
-rw-r--r--noncore/settings/mediummount/mainwindow.cc2
3 files changed, 4 insertions, 2 deletions
diff --git a/noncore/settings/appearance2/appearance.cpp b/noncore/settings/appearance2/appearance.cpp
index e9e0ad9..2b35119 100644
--- a/noncore/settings/appearance2/appearance.cpp
+++ b/noncore/settings/appearance2/appearance.cpp
@@ -378,65 +378,65 @@ QWidget *Appearance::createAdvancedTab ( QWidget *parent, Config &cfg )
378 m_tabstyle_list = new QComboBox ( false, tab, "tabstyle" ); 378 m_tabstyle_list = new QComboBox ( false, tab, "tabstyle" );
379 m_tabstyle_list-> insertItem ( tr( "Tabs" )); 379 m_tabstyle_list-> insertItem ( tr( "Tabs" ));
380 m_tabstyle_list-> insertItem ( tr( "Tabs w/icons" )); 380 m_tabstyle_list-> insertItem ( tr( "Tabs w/icons" ));
381 m_tabstyle_list-> insertItem ( tr( "Drop down list" )); 381 m_tabstyle_list-> insertItem ( tr( "Drop down list" ));
382 m_tabstyle_list-> insertItem ( tr( "Drop down list w/icons" )); 382 m_tabstyle_list-> insertItem ( tr( "Drop down list w/icons" ));
383 m_tabstyle_list-> setCurrentItem ( style ); 383 m_tabstyle_list-> setCurrentItem ( style );
384 gridLayout-> addMultiCellWidget ( m_tabstyle_list, 0, 0, 1, 2 ); 384 gridLayout-> addMultiCellWidget ( m_tabstyle_list, 0, 0, 1, 2 );
385 QWhatsThis::add( m_tabstyle_list, tr( "Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:\n\n1. Tabs - normal tabs with text labels only\n2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab\n3. Drop down list - a vertical listing of tabs\n4. Drop down list w/icons - a vertical listing of tabs with icons" ) ); 385 QWhatsThis::add( m_tabstyle_list, tr( "Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:\n\n1. Tabs - normal tabs with text labels only\n2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab\n3. Drop down list - a vertical listing of tabs\n4. Drop down list w/icons - a vertical listing of tabs with icons" ) );
386 386
387 m_tabstyle_top = new QRadioButton( tr( "Top" ), tab, "tabpostop" ); 387 m_tabstyle_top = new QRadioButton( tr( "Top" ), tab, "tabpostop" );
388 btngrp-> insert ( m_tabstyle_top ); 388 btngrp-> insert ( m_tabstyle_top );
389 gridLayout-> addWidget( m_tabstyle_top, 1, 1 ); 389 gridLayout-> addWidget( m_tabstyle_top, 1, 1 );
390 QWhatsThis::add( m_tabstyle_top, tr( "Click here so that tabs appear at the top of the window." ) ); 390 QWhatsThis::add( m_tabstyle_top, tr( "Click here so that tabs appear at the top of the window." ) );
391 391
392 m_tabstyle_bottom = new QRadioButton( tr( "Bottom" ), tab, "tabposbottom" ); 392 m_tabstyle_bottom = new QRadioButton( tr( "Bottom" ), tab, "tabposbottom" );
393 btngrp-> insert ( m_tabstyle_bottom ); 393 btngrp-> insert ( m_tabstyle_bottom );
394 gridLayout-> addWidget( m_tabstyle_bottom, 1, 2 ); 394 gridLayout-> addWidget( m_tabstyle_bottom, 1, 2 );
395 QWhatsThis::add( m_tabstyle_bottom, tr( "Click here so that tabs appear at the bottom of the window." ) ); 395 QWhatsThis::add( m_tabstyle_bottom, tr( "Click here so that tabs appear at the bottom of the window." ) );
396 396
397 m_tabstyle_top-> setChecked ( tabtop ); 397 m_tabstyle_top-> setChecked ( tabtop );
398 m_tabstyle_bottom-> setChecked ( !tabtop ); 398 m_tabstyle_bottom-> setChecked ( !tabtop );
399 399
400 m_original_tabstyle = style; 400 m_original_tabstyle = style;
401 m_original_tabpos = tabtop; 401 m_original_tabpos = tabtop;
402 402
403 return tab; 403 return tab;
404} 404}
405 405
406 406
407Appearance::Appearance( QWidget* parent, const char* name, WFlags ) 407Appearance::Appearance( QWidget* parent, const char* name, WFlags )
408 : QDialog ( parent, name, true, WStyle_ContextHelp ) 408 : QDialog ( parent, name, true, WStyle_ContextHelp )
409{ 409{
410 setCaption( tr( "Appearance" ) ); 410 setCaption( tr( "Appearance Settings" ) );
411 411
412 Config config( "qpe" ); 412 Config config( "qpe" );
413 config.setGroup( "Appearance" ); 413 config.setGroup( "Appearance" );
414 414
415 QVBoxLayout *top = new QVBoxLayout ( this, 3, 3 ); 415 QVBoxLayout *top = new QVBoxLayout ( this, 3, 3 );
416 416
417 m_sample = new SampleWindow ( this ); 417 m_sample = new SampleWindow ( this );
418 m_sample-> setDecoration ( new DefaultWindowDecoration ( )); 418 m_sample-> setDecoration ( new DefaultWindowDecoration ( ));
419 QWhatsThis::add( m_sample, tr( "This is a preview window. Look here to see your new appearance as options are changed." ) ); 419 QWhatsThis::add( m_sample, tr( "This is a preview window. Look here to see your new appearance as options are changed." ) );
420 420
421 OTabWidget* tw = new OTabWidget ( this, "tabwidget", OTabWidget::Global, OTabWidget::Bottom ); 421 OTabWidget* tw = new OTabWidget ( this, "tabwidget", OTabWidget::Global, OTabWidget::Bottom );
422 QWidget *styletab; 422 QWidget *styletab;
423 423
424 m_color_list = 0; 424 m_color_list = 0;
425 425
426 tw-> addTab ( styletab = createStyleTab ( tw, config ), "appearance/style", tr( "Style" )); 426 tw-> addTab ( styletab = createStyleTab ( tw, config ), "appearance/style", tr( "Style" ));
427 tw-> addTab ( createFontTab ( tw, config ), "appearance/font", tr( "Font" )); 427 tw-> addTab ( createFontTab ( tw, config ), "appearance/font", tr( "Font" ));
428 tw-> addTab ( createColorTab ( tw, config ), "appearance/color", tr( "Colors" ) ); 428 tw-> addTab ( createColorTab ( tw, config ), "appearance/color", tr( "Colors" ) );
429 tw-> addTab ( createDecoTab ( tw, config ), "appearance/deco", tr( "Windows" ) ); 429 tw-> addTab ( createDecoTab ( tw, config ), "appearance/deco", tr( "Windows" ) );
430 tw-> addTab ( m_advtab = createAdvancedTab ( tw, config ), "appearance/advanced", tr( "Advanced" ) ); 430 tw-> addTab ( m_advtab = createAdvancedTab ( tw, config ), "appearance/advanced", tr( "Advanced" ) );
431 431
432 top-> addWidget ( tw, 10 ); 432 top-> addWidget ( tw, 10 );
433 top-> addWidget ( m_sample, 1 ); 433 top-> addWidget ( m_sample, 1 );
434 434
435 tw-> setCurrentTab ( styletab ); 435 tw-> setCurrentTab ( styletab );
436 connect ( tw, SIGNAL( currentChanged ( QWidget * )), this, SLOT( tabChanged ( QWidget * ))); 436 connect ( tw, SIGNAL( currentChanged ( QWidget * )), this, SLOT( tabChanged ( QWidget * )));
437 437
438 m_style_changed = m_font_changed = m_color_changed = m_deco_changed = false; 438 m_style_changed = m_font_changed = m_color_changed = m_deco_changed = false;
439} 439}
440 440
441Appearance::~Appearance() 441Appearance::~Appearance()
442{ 442{
diff --git a/noncore/settings/language/languagesettingsbase.ui b/noncore/settings/language/languagesettingsbase.ui
index 62bdafa..ae317e4 100644
--- a/noncore/settings/language/languagesettingsbase.ui
+++ b/noncore/settings/language/languagesettingsbase.ui
@@ -1,51 +1,51 @@
1<!DOCTYPE UI><UI> 1<!DOCTYPE UI><UI>
2<class>LanguageSettingsBase</class> 2<class>LanguageSettingsBase</class>
3<widget> 3<widget>
4 <class>QDialog</class> 4 <class>QDialog</class>
5 <property stdset="1"> 5 <property stdset="1">
6 <name>name</name> 6 <name>name</name>
7 <cstring>LanguageSettingsBase</cstring> 7 <cstring>LanguageSettingsBase</cstring>
8 </property> 8 </property>
9 <property stdset="1"> 9 <property stdset="1">
10 <name>geometry</name> 10 <name>geometry</name>
11 <rect> 11 <rect>
12 <x>0</x> 12 <x>0</x>
13 <y>0</y> 13 <y>0</y>
14 <width>369</width> 14 <width>369</width>
15 <height>492</height> 15 <height>492</height>
16 </rect> 16 </rect>
17 </property> 17 </property>
18 <property stdset="1"> 18 <property stdset="1">
19 <name>caption</name> 19 <name>caption</name>
20 <string>Language</string> 20 <string>Language Settings</string>
21 </property> 21 </property>
22 <vbox> 22 <vbox>
23 <property stdset="1"> 23 <property stdset="1">
24 <name>margin</name> 24 <name>margin</name>
25 <number>11</number> 25 <number>11</number>
26 </property> 26 </property>
27 <property stdset="1"> 27 <property stdset="1">
28 <name>spacing</name> 28 <name>spacing</name>
29 <number>6</number> 29 <number>6</number>
30 </property> 30 </property>
31 <widget> 31 <widget>
32 <class>QLabel</class> 32 <class>QLabel</class>
33 <property stdset="1"> 33 <property stdset="1">
34 <name>name</name> 34 <name>name</name>
35 <cstring>TextLabel1</cstring> 35 <cstring>TextLabel1</cstring>
36 </property> 36 </property>
37 <property stdset="1"> 37 <property stdset="1">
38 <name>text</name> 38 <name>text</name>
39 <string>Select language</string> 39 <string>Select language</string>
40 </property> 40 </property>
41 </widget> 41 </widget>
42 <widget> 42 <widget>
43 <class>QListBox</class> 43 <class>QListBox</class>
44 <property stdset="1"> 44 <property stdset="1">
45 <name>name</name> 45 <name>name</name>
46 <cstring>languages</cstring> 46 <cstring>languages</cstring>
47 </property> 47 </property>
48 </widget> 48 </widget>
49 </vbox> 49 </vbox>
50</widget> 50</widget>
51</UI> 51</UI>
diff --git a/noncore/settings/mediummount/mainwindow.cc b/noncore/settings/mediummount/mainwindow.cc
index cf8ad6c..6d9bb80 100644
--- a/noncore/settings/mediummount/mainwindow.cc
+++ b/noncore/settings/mediummount/mainwindow.cc
@@ -1,51 +1,53 @@
1 1
2 2
3#include <qtabwidget.h> 3#include <qtabwidget.h>
4#include <qlayout.h> 4#include <qlayout.h>
5 5
6#include <qpe/storage.h> 6#include <qpe/storage.h>
7 7
8#include "mediumwidget.h" 8#include "mediumwidget.h"
9#include "mediumglobal.h" 9#include "mediumglobal.h"
10 10
11#include "mainwindow.h" 11#include "mainwindow.h"
12 12
13using namespace MediumMountSetting; 13using namespace MediumMountSetting;
14 14
15 15
16MainWindow::MainWindow( QWidget *parent, const char *name, WFlags ) 16MainWindow::MainWindow( QWidget *parent, const char *name, WFlags )
17 : QMainWindow( parent, name, WStyle_ContextHelp ) 17 : QMainWindow( parent, name, WStyle_ContextHelp )
18 18
19{ 19{
20 setCaption ( tr( "Medium Mount Settings" ));
21
20 // m_lay = new QVBoxLayout( this ); 22 // m_lay = new QVBoxLayout( this );
21 m_tab = new QTabWidget( this ); 23 m_tab = new QTabWidget( this );
22 setCentralWidget( m_tab ); 24 setCentralWidget( m_tab );
23 init(); 25 init();
24} 26}
25 27
26MainWindow::~MainWindow() 28MainWindow::~MainWindow()
27{ 29{
28 30
29} 31}
30void MainWindow::init() 32void MainWindow::init()
31{ 33{
32 m_global = new MediumGlobalWidget( m_tab, "test drive" ); 34 m_global = new MediumGlobalWidget( m_tab, "test drive" );
33 m_tab->addTab( m_global, tr("Global") ); 35 m_tab->addTab( m_global, tr("Global") );
34 36
35 StorageInfo storage; 37 StorageInfo storage;
36 const QList<FileSystem> &fs = storage.fileSystems(); 38 const QList<FileSystem> &fs = storage.fileSystems();
37 QListIterator<FileSystem> it( fs ); 39 QListIterator<FileSystem> it( fs );
38 MediumMountWidget *wid; 40 MediumMountWidget *wid;
39 for( ; it.current(); ++it ){ 41 for( ; it.current(); ++it ){
40 if( (*it)->isRemovable() ){ 42 if( (*it)->isRemovable() ){
41 wid = new MediumMountWidget((*it)->path(), QPixmap(), m_tab ); 43 wid = new MediumMountWidget((*it)->path(), QPixmap(), m_tab );
42 m_mediums.append( wid ); 44 m_mediums.append( wid );
43 m_tab->addTab( wid, (*it)->name() ); 45 m_tab->addTab( wid, (*it)->name() );
44 } 46 }
45 } 47 }
46} 48}
47 49
48void MainWindow::slotGlobalChanged(int ) 50void MainWindow::slotGlobalChanged(int )
49{ 51{
50 52
51} 53}