author | sandman <sandman> | 2002-12-22 16:37:07 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-12-22 16:37:07 (UTC) |
commit | 150e066a847e8e10848cfd10a635b9cec57347b3 (patch) (side-by-side diff) | |
tree | 8e16dec1950321db67455b0011b79fcae0469c68 /noncore | |
parent | 9ee5295d934e0876dfe0b7e0a4ee05012c491f91 (diff) | |
download | opie-150e066a847e8e10848cfd10a635b9cec57347b3.zip opie-150e066a847e8e10848cfd10a635b9cec57347b3.tar.gz opie-150e066a847e8e10848cfd10a635b9cec57347b3.tar.bz2 |
Fixed some window captions to match the corresponding launcher icons
-rw-r--r-- | noncore/settings/appearance2/appearance.cpp | 2 | ||||
-rw-r--r-- | noncore/settings/language/languagesettingsbase.ui | 2 | ||||
-rw-r--r-- | noncore/settings/mediummount/mainwindow.cc | 2 |
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 @@ -362,97 +362,97 @@ QWidget *Appearance::createAdvancedTab ( QWidget *parent, Config &cfg ) vertLayout-> addSpacing ( 3 ); QGridLayout* gridLayout = new QGridLayout ( vertLayout, 0, 0, 3, 0 ); int style = cfg. readNumEntry ( "TabStyle", 2 ) - 1; bool tabtop = ( cfg. readEntry ( "TabPosition", "Top" ) == "Top" ); QLabel* label = new QLabel( tr( "Tab style:" ), tab ); gridLayout-> addWidget ( label, 0, 0 ); QWhatsThis::add( label, 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" ) ); QButtonGroup* btngrp = new QButtonGroup( tab, "buttongroup" ); btngrp-> hide ( ); btngrp-> setExclusive ( true ); m_tabstyle_list = new QComboBox ( false, tab, "tabstyle" ); m_tabstyle_list-> insertItem ( tr( "Tabs" )); m_tabstyle_list-> insertItem ( tr( "Tabs w/icons" )); m_tabstyle_list-> insertItem ( tr( "Drop down list" )); m_tabstyle_list-> insertItem ( tr( "Drop down list w/icons" )); m_tabstyle_list-> setCurrentItem ( style ); gridLayout-> addMultiCellWidget ( m_tabstyle_list, 0, 0, 1, 2 ); 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" ) ); m_tabstyle_top = new QRadioButton( tr( "Top" ), tab, "tabpostop" ); btngrp-> insert ( m_tabstyle_top ); gridLayout-> addWidget( m_tabstyle_top, 1, 1 ); QWhatsThis::add( m_tabstyle_top, tr( "Click here so that tabs appear at the top of the window." ) ); m_tabstyle_bottom = new QRadioButton( tr( "Bottom" ), tab, "tabposbottom" ); btngrp-> insert ( m_tabstyle_bottom ); gridLayout-> addWidget( m_tabstyle_bottom, 1, 2 ); QWhatsThis::add( m_tabstyle_bottom, tr( "Click here so that tabs appear at the bottom of the window." ) ); m_tabstyle_top-> setChecked ( tabtop ); m_tabstyle_bottom-> setChecked ( !tabtop ); m_original_tabstyle = style; m_original_tabpos = tabtop; return tab; } Appearance::Appearance( QWidget* parent, const char* name, WFlags ) : QDialog ( parent, name, true, WStyle_ContextHelp ) { - setCaption( tr( "Appearance" ) ); + setCaption( tr( "Appearance Settings" ) ); Config config( "qpe" ); config.setGroup( "Appearance" ); QVBoxLayout *top = new QVBoxLayout ( this, 3, 3 ); m_sample = new SampleWindow ( this ); m_sample-> setDecoration ( new DefaultWindowDecoration ( )); QWhatsThis::add( m_sample, tr( "This is a preview window. Look here to see your new appearance as options are changed." ) ); OTabWidget* tw = new OTabWidget ( this, "tabwidget", OTabWidget::Global, OTabWidget::Bottom ); QWidget *styletab; m_color_list = 0; tw-> addTab ( styletab = createStyleTab ( tw, config ), "appearance/style", tr( "Style" )); tw-> addTab ( createFontTab ( tw, config ), "appearance/font", tr( "Font" )); tw-> addTab ( createColorTab ( tw, config ), "appearance/color", tr( "Colors" ) ); tw-> addTab ( createDecoTab ( tw, config ), "appearance/deco", tr( "Windows" ) ); tw-> addTab ( m_advtab = createAdvancedTab ( tw, config ), "appearance/advanced", tr( "Advanced" ) ); top-> addWidget ( tw, 10 ); top-> addWidget ( m_sample, 1 ); tw-> setCurrentTab ( styletab ); connect ( tw, SIGNAL( currentChanged ( QWidget * )), this, SLOT( tabChanged ( QWidget * ))); m_style_changed = m_font_changed = m_color_changed = m_deco_changed = false; } Appearance::~Appearance() { } void Appearance::tabChanged ( QWidget *w ) { if ( w == m_advtab ) { m_sample-> hide ( ); updateGeometry ( ); // shouldn't be necessary ... } else m_sample-> show ( ); } void Appearance::accept ( ) { bool newtabpos = m_tabstyle_top-> isChecked ( ); int newtabstyle = m_tabstyle_list-> currentItem ( ); 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 @@ <!DOCTYPE UI><UI> <class>LanguageSettingsBase</class> <widget> <class>QDialog</class> <property stdset="1"> <name>name</name> <cstring>LanguageSettingsBase</cstring> </property> <property stdset="1"> <name>geometry</name> <rect> <x>0</x> <y>0</y> <width>369</width> <height>492</height> </rect> </property> <property stdset="1"> <name>caption</name> - <string>Language</string> + <string>Language Settings</string> </property> <vbox> <property stdset="1"> <name>margin</name> <number>11</number> </property> <property stdset="1"> <name>spacing</name> <number>6</number> </property> <widget> <class>QLabel</class> <property stdset="1"> <name>name</name> <cstring>TextLabel1</cstring> </property> <property stdset="1"> <name>text</name> <string>Select language</string> </property> </widget> <widget> <class>QListBox</class> <property stdset="1"> <name>name</name> <cstring>languages</cstring> </property> </widget> </vbox> </widget> </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,55 +1,57 @@ #include <qtabwidget.h> #include <qlayout.h> #include <qpe/storage.h> #include "mediumwidget.h" #include "mediumglobal.h" #include "mainwindow.h" using namespace MediumMountSetting; MainWindow::MainWindow( QWidget *parent, const char *name, WFlags ) : QMainWindow( parent, name, WStyle_ContextHelp ) { + setCaption ( tr( "Medium Mount Settings" )); + // m_lay = new QVBoxLayout( this ); m_tab = new QTabWidget( this ); setCentralWidget( m_tab ); init(); } MainWindow::~MainWindow() { } void MainWindow::init() { m_global = new MediumGlobalWidget( m_tab, "test drive" ); m_tab->addTab( m_global, tr("Global") ); StorageInfo storage; const QList<FileSystem> &fs = storage.fileSystems(); QListIterator<FileSystem> it( fs ); MediumMountWidget *wid; for( ; it.current(); ++it ){ if( (*it)->isRemovable() ){ wid = new MediumMountWidget((*it)->path(), QPixmap(), m_tab ); m_mediums.append( wid ); m_tab->addTab( wid, (*it)->name() ); } } } void MainWindow::slotGlobalChanged(int ) { } void MainWindow::slotCheckingChanged(int ) { } |