From: <vac...@us...> - 2008-08-31 22:45:58
|
Revision: 6075 http://krusader.svn.sourceforge.net/krusader/?rev=6075&view=rev Author: vaclavjuza Date: 2008-08-31 22:45:54 +0000 (Sun, 31 Aug 2008) Log Message: ----------- Konfigurator has scrollbars if necessary Modified Paths: -------------- trunk/krusader_kde4/ChangeLog trunk/krusader_kde4/krusader/Konfigurator/kgadvanced.cpp trunk/krusader_kde4/krusader/Konfigurator/kgarchives.cpp trunk/krusader_kde4/krusader/Konfigurator/kgcolors.cpp trunk/krusader_kde4/krusader/Konfigurator/kggeneral.cpp trunk/krusader_kde4/krusader/Konfigurator/kglookfeel.cpp trunk/krusader_kde4/krusader/Konfigurator/kgstartup.cpp trunk/krusader_kde4/krusader/Konfigurator/kguseractions.cpp trunk/krusader_kde4/krusader/Konfigurator/konfigurator.cpp trunk/krusader_kde4/krusader/Konfigurator/konfiguratorpage.cpp trunk/krusader_kde4/krusader/Konfigurator/konfiguratorpage.h Modified: trunk/krusader_kde4/ChangeLog =================================================================== --- trunk/krusader_kde4/ChangeLog 2008-08-25 19:04:04 UTC (rev 6074) +++ trunk/krusader_kde4/ChangeLog 2008-08-31 22:45:54 UTC (rev 6075) @@ -7,6 +7,7 @@ ARCH: QuickSearch is moved to KrView from Detailed/Brief views ARCH: Keyboard handling is moved to KrView from Detailed/Brief views + FIXED: Konfigurator has scrollbars if necessary. FIXED: [ 2027518 ] Does not build with -DBUILD_SHARED_LIBS:BOOL=ON (thanks to Funda Wang) FIXED: [ 2041732 ] Krusader 2.0.0 beta1 missing title bar under Compiz Modified: trunk/krusader_kde4/krusader/Konfigurator/kgadvanced.cpp =================================================================== --- trunk/krusader_kde4/krusader/Konfigurator/kgadvanced.cpp 2008-08-25 19:04:04 UTC (rev 6074) +++ trunk/krusader_kde4/krusader/Konfigurator/kgadvanced.cpp 2008-08-31 22:45:54 UTC (rev 6075) @@ -40,12 +40,15 @@ KgAdvanced::KgAdvanced( bool first, QWidget* parent ) : KonfiguratorPage( first, parent ) { - QGridLayout *kgAdvancedLayout = new QGridLayout( this ); + QWidget *innerWidget = new QFrame( this ); + setWidget( innerWidget ); + setWidgetResizable( true ); + QGridLayout *kgAdvancedLayout = new QGridLayout( innerWidget ); kgAdvancedLayout->setSpacing( 6 ); // -------------------------- GENERAL GROUPBOX ---------------------------------- - QGroupBox *generalGrp = createFrame( i18n( "General" ), this ); + QGroupBox *generalGrp = createFrame( i18n( "General" ), innerWidget ); QGridLayout *generalGrid = createGridLayout( generalGrp ); KONFIGURATOR_CHECKBOX_PARAM generalSettings[] = @@ -71,7 +74,7 @@ // ----------------------- CONFIRMATIONS GROUPBOX ------------------------------- - QGroupBox *confirmGrp = createFrame( i18n( "Confirmations" ), this ); + QGroupBox *confirmGrp = createFrame( i18n( "Confirmations" ), innerWidget ); QGridLayout *confirmGrid = createGridLayout( confirmGrp ); addLabel( confirmGrid, 0, 0, "\n"+i18n( "Request user confirmation for the following operations:" )+"\n", @@ -95,7 +98,7 @@ // ------------------------ FINE-TUNING GROUPBOX -------------------------------- - QGroupBox *fineTuneGrp = createFrame( i18n( "Fine-Tuning" ), this ); + QGroupBox *fineTuneGrp = createFrame( i18n( "Fine-Tuning" ), innerWidget ); QGridLayout *fineTuneGrid = createGridLayout( fineTuneGrp ); fineTuneGrid->setAlignment( Qt::AlignLeft | Qt::AlignTop ); Modified: trunk/krusader_kde4/krusader/Konfigurator/kgarchives.cpp =================================================================== --- trunk/krusader_kde4/krusader/Konfigurator/kgarchives.cpp 2008-08-25 19:04:04 UTC (rev 6074) +++ trunk/krusader_kde4/krusader/Konfigurator/kgarchives.cpp 2008-08-31 22:45:54 UTC (rev 6075) @@ -43,12 +43,15 @@ KgArchives::KgArchives( bool first, QWidget* parent ) : KonfiguratorPage( first, parent ) { - QGridLayout *kgArchivesLayout = new QGridLayout( this ); + QWidget *innerWidget = new QFrame( this ); + setWidget( innerWidget ); + setWidgetResizable( true ); + QGridLayout *kgArchivesLayout = new QGridLayout( innerWidget ); kgArchivesLayout->setSpacing( 6 ); // -------------------------- GENERAL GROUPBOX ---------------------------------- - QGroupBox *generalGrp = createFrame( i18n( "General" ), this ); + QGroupBox *generalGrp = createFrame( i18n( "General" ), innerWidget ); QGridLayout *generalGrid = createGridLayout( generalGrp ); addLabel( generalGrid, 0, 0, i18n( "Krusader transparently handles the following types of archives:" ), @@ -94,7 +97,7 @@ // ------------------------ FINE-TUNING GROUPBOX -------------------------------- - QGroupBox *fineTuneGrp = createFrame( i18n( "Fine-Tuning" ), this ); + QGroupBox *fineTuneGrp = createFrame( i18n( "Fine-Tuning" ), innerWidget ); QGridLayout *fineTuneGrid = createGridLayout( fineTuneGrp ); KONFIGURATOR_CHECKBOX_PARAM finetuners[] = Modified: trunk/krusader_kde4/krusader/Konfigurator/kgcolors.cpp =================================================================== --- trunk/krusader_kde4/krusader/Konfigurator/kgcolors.cpp 2008-08-25 19:04:04 UTC (rev 6074) +++ trunk/krusader_kde4/krusader/Konfigurator/kgcolors.cpp 2008-08-31 22:45:54 UTC (rev 6075) @@ -45,12 +45,15 @@ KgColors::KgColors( bool first, QWidget* parent ) : KonfiguratorPage( first, parent ), offset( 0 ) { - QGridLayout *kgColorsLayout = new QGridLayout( this ); + QWidget *innerWidget = new QFrame( this ); + setWidget( innerWidget ); + setWidgetResizable( true ); + QGridLayout *kgColorsLayout = new QGridLayout( innerWidget ); kgColorsLayout->setSpacing( 6 ); // -------------------------- GENERAL GROUPBOX ---------------------------------- - QGroupBox *generalGrp = createFrame( i18n( "General" ), this ); + QGroupBox *generalGrp = createFrame( i18n( "General" ), innerWidget ); QGridLayout *generalGrid = createGridLayout( generalGrp ); generalGrid->setSpacing( 0 ); @@ -73,7 +76,7 @@ connect( generals->find( "Dim Inactive Colors" ), SIGNAL( stateChanged( int ) ), this, SLOT( slotDisable() ) ); kgColorsLayout->addWidget( generalGrp, 0 ,0, 1, 3 ); - QWidget *hboxWidget = new QWidget( this ); + QWidget *hboxWidget = new QWidget( innerWidget ); QHBoxLayout *hbox = new QHBoxLayout( hboxWidget ); // -------------------------- COLORS GROUPBOX ---------------------------------- @@ -249,14 +252,14 @@ kgColorsLayout->addWidget( hboxWidget, 1 , 0, 1, 3 ); - importBtn = new KPushButton(i18n("Import color-scheme"),this); + importBtn = new KPushButton(i18n("Import color-scheme"),innerWidget); kgColorsLayout->addWidget(importBtn,2,0); - exportBtn = new KPushButton(i18n("Export color-scheme"),this); + exportBtn = new KPushButton(i18n("Export color-scheme"),innerWidget); kgColorsLayout->addWidget(exportBtn,2,1); - kgColorsLayout->addWidget(createSpacer(this), 2,2); + kgColorsLayout->addWidget(createSpacer(innerWidget), 2,2); connect(importBtn, SIGNAL(clicked()), this, SLOT(slotImportColors())); connect(exportBtn, SIGNAL(clicked()), this, SLOT(slotExportColors())); - + slotDisable(); } Modified: trunk/krusader_kde4/krusader/Konfigurator/kggeneral.cpp =================================================================== --- trunk/krusader_kde4/krusader/Konfigurator/kggeneral.cpp 2008-08-25 19:04:04 UTC (rev 6074) +++ trunk/krusader_kde4/krusader/Konfigurator/kggeneral.cpp 2008-08-31 22:45:54 UTC (rev 6075) @@ -48,12 +48,15 @@ if( first ) slotFindTools(); - QGridLayout *kgGeneralLayout = new QGridLayout( this ); + QWidget *innerWidget = new QFrame( this ); + setWidget( innerWidget ); + setWidgetResizable( true ); + QGridLayout *kgGeneralLayout = new QGridLayout( innerWidget ); kgGeneralLayout->setSpacing( 6 ); // -------------------------- GENERAL GROUPBOX ---------------------------------- - QGroupBox *generalGrp = createFrame( i18n( "General" ), this ); + QGroupBox *generalGrp = createFrame( i18n( "General" ), innerWidget ); QGridLayout *generalGrid = createGridLayout( generalGrp ); KONFIGURATOR_NAME_VALUE_TIP deleteMode[] = Modified: trunk/krusader_kde4/krusader/Konfigurator/kglookfeel.cpp =================================================================== --- trunk/krusader_kde4/krusader/Konfigurator/kglookfeel.cpp 2008-08-25 19:04:04 UTC (rev 6074) +++ trunk/krusader_kde4/krusader/Konfigurator/kglookfeel.cpp 2008-08-31 22:45:54 UTC (rev 6075) @@ -33,6 +33,7 @@ #include "../defaults.h" #include "../Dialogs/krdialogs.h" #include <qtabwidget.h> +#include <QFrame> #include <QGridLayout> #include <QLabel> #include <QVBoxLayout> @@ -55,10 +56,11 @@ KgLookFeel::KgLookFeel( bool first, QWidget* parent ) : KonfiguratorPage( first, parent ) { - QGridLayout *kgLookAndFeelLayout = new QGridLayout( this ); + QWidget *innerWidget = this; + QGridLayout *kgLookAndFeelLayout = new QGridLayout( innerWidget ); kgLookAndFeelLayout->setSpacing( 6 ); - tabWidget = new QTabWidget( this ); + tabWidget = new QTabWidget( innerWidget ); setupOperationTab(); setupPanelTab(); @@ -72,8 +74,12 @@ // ---------------------------- OPERATION TAB ------------------------------------- // --------------------------------------------------------------------------------------- void KgLookFeel::setupOperationTab() { - QWidget *tab = new QWidget( tabWidget ); - tabWidget->addTab( tab, i18n( "Operation" ) ); + QScrollArea *scrollArea = new QScrollArea( tabWidget ); + QWidget *tab = new QWidget( scrollArea ); + scrollArea->setFrameStyle( QFrame::NoFrame ); + scrollArea->setWidget( tab ); + scrollArea->setWidgetResizable( true ); + tabWidget->addTab( scrollArea, i18n( "Operation" ) ); QGridLayout *lookAndFeelLayout = new QGridLayout( tab ); lookAndFeelLayout->setSpacing( 6 ); @@ -120,8 +126,12 @@ // ---------------------------- PANEL TAB ------------------------------------- // ---------------------------------------------------------------------------------- void KgLookFeel::setupPanelTab() { - QWidget* tab_panel = new QWidget( tabWidget ); - tabWidget->addTab( tab_panel, i18n( "Panel" ) ); + QScrollArea *scrollArea = new QScrollArea( tabWidget ); + QWidget *tab_panel = new QWidget( scrollArea ); + scrollArea->setFrameStyle( QFrame::NoFrame ); + scrollArea->setWidget( tab_panel ); + scrollArea->setWidgetResizable( true ); + tabWidget->addTab( scrollArea, i18n( "Panel" ) ); QGridLayout *panelLayout = new QGridLayout( tab_panel ); panelLayout->setSpacing( 6 ); @@ -221,8 +231,12 @@ // -------------------------- Panel Toolbar TAB ---------------------------------- // ----------------------------------------------------------------------------------- void KgLookFeel::setupPanelToolbarTab() { - QWidget *tab_4 = new QWidget( tabWidget ); - tabWidget->addTab( tab_4, i18n( "Panel Toolbar" ) ); + QScrollArea *scrollArea = new QScrollArea( tabWidget ); + QWidget *tab_4 = new QWidget( scrollArea ); + scrollArea->setFrameStyle( QFrame::NoFrame ); + scrollArea->setWidget( tab_4 ); + scrollArea->setWidgetResizable( true ); + tabWidget->addTab( scrollArea, i18n( "Panel Toolbar" ) ); QBoxLayout * panelToolbarVLayout = new QVBoxLayout( tab_4 ); panelToolbarVLayout->setSpacing( 6 ); @@ -266,8 +280,12 @@ // -------------------------- Mouse TAB ---------------------------------- // --------------------------------------------------------------------------- void KgLookFeel::setupMouseModeTab() { - QWidget *tab_mouse = new QWidget( tabWidget ); - tabWidget->addTab( tab_mouse, i18n( "Selection Mode" ) ); + QScrollArea *scrollArea = new QScrollArea( tabWidget ); + QWidget *tab_mouse = new QWidget( scrollArea ); + scrollArea->setFrameStyle( QFrame::NoFrame ); + scrollArea->setWidget( tab_mouse ); + scrollArea->setWidgetResizable( true ); + tabWidget->addTab( scrollArea, i18n( "Selection Mode" ) ); QGridLayout *mouseLayout = new QGridLayout( tab_mouse ); mouseLayout->setSpacing( 6 ); mouseLayout->setContentsMargins( 11, 11, 11, 11 ); Modified: trunk/krusader_kde4/krusader/Konfigurator/kgstartup.cpp =================================================================== --- trunk/krusader_kde4/krusader/Konfigurator/kgstartup.cpp 2008-08-25 19:04:04 UTC (rev 6074) +++ trunk/krusader_kde4/krusader/Konfigurator/kgstartup.cpp 2008-08-31 22:45:54 UTC (rev 6075) @@ -40,12 +40,15 @@ KgStartup::KgStartup( bool first, QWidget* parent ) : KonfiguratorPage( first, parent ), profileCombo( 0 ) { - QGridLayout *kgStartupLayout = new QGridLayout( this ); + QWidget *innerWidget = new QFrame( this ); + setWidget( innerWidget ); + setWidgetResizable( true ); + QGridLayout *kgStartupLayout = new QGridLayout( innerWidget ); kgStartupLayout->setSpacing( 6 ); // --------------------------- PANELS GROUPBOX ---------------------------------- - QGroupBox *panelsGrp = createFrame( i18n( "General" ), this ); + QGroupBox *panelsGrp = createFrame( i18n( "General" ), innerWidget ); QGridLayout *panelsGrid = createGridLayout( panelsGrp ); QString s = "<p><img src='toolbar|kr_profile'></p>" + i18n( "Defines the panel profile used at startup. A panel profile contains:<ul><li>all the tabs paths</li><li>the current tab</li><li>the active panel</li></ul><b><Last session></b> is a special panel profile which is saved automatically when Krusader is closed."); @@ -81,7 +84,7 @@ // ------------------------ USERINTERFACE GROUPBOX ------------------------------ - QGroupBox *uiGrp = createFrame( i18n( "User Interface" ), this ); + QGroupBox *uiGrp = createFrame( i18n( "User Interface" ), innerWidget ); QGridLayout *uiGrid = createGridLayout( uiGrp ); KONFIGURATOR_CHECKBOX_PARAM uiCheckBoxes[] = Modified: trunk/krusader_kde4/krusader/Konfigurator/kguseractions.cpp =================================================================== --- trunk/krusader_kde4/krusader/Konfigurator/kguseractions.cpp 2008-08-25 19:04:04 UTC (rev 6074) +++ trunk/krusader_kde4/krusader/Konfigurator/kguseractions.cpp 2008-08-31 22:45:54 UTC (rev 6075) @@ -43,10 +43,13 @@ KgUserActions::KgUserActions( bool first, QWidget* parent ) : KonfiguratorPage( first, parent ) { - QGridLayout *kgUserActionLayout = new QGridLayout( this ); + QWidget *innerWidget = new QFrame( this ); + setWidget( innerWidget ); + setWidgetResizable( true ); + QGridLayout *kgUserActionLayout = new QGridLayout( innerWidget ); // ============= Info Group ============= - QGroupBox *InfoGroup = createFrame( i18n( "Information" ), this ); + QGroupBox *InfoGroup = createFrame( i18n( "Information" ), innerWidget ); QGridLayout *InfoGrid = createGridLayout( InfoGroup ); // terminal for the UserActions @@ -62,7 +65,7 @@ kgUserActionLayout->addWidget( InfoGroup, 0 ,0 ); // ============= Terminal Group ============= - QGroupBox *terminalGroup = createFrame( i18n( "Terminal execution" ), this ); + QGroupBox *terminalGroup = createFrame( i18n( "Terminal execution" ), innerWidget ); QGridLayout *terminalGrid = createGridLayout( terminalGroup ); // terminal for the UserActions @@ -76,7 +79,7 @@ kgUserActionLayout->addWidget( terminalGroup, 1 ,0 ); // ============= Outputcollection Group ============= - QGroupBox *outputGroup = createFrame( i18n( "Output collection" ), this ); + QGroupBox *outputGroup = createFrame( i18n( "Output collection" ), innerWidget ); QGridLayout *outputGrid = createGridLayout( outputGroup ); QWidget *hboxWidget = new QWidget( outputGroup ); Modified: trunk/krusader_kde4/krusader/Konfigurator/konfigurator.cpp =================================================================== --- trunk/krusader_kde4/krusader/Konfigurator/konfigurator.cpp 2008-08-25 19:04:04 UTC (rev 6074) +++ trunk/krusader_kde4/krusader/Konfigurator/konfigurator.cpp 2008-08-31 22:45:54 UTC (rev 6075) @@ -81,6 +81,7 @@ connect( this, SIGNAL( user1Clicked() ), this, SLOT( slotUser1() ) ); createLayout( startPage ); + setInitialSize( QSize( 1000, 700 ) ); exec(); } Modified: trunk/krusader_kde4/krusader/Konfigurator/konfiguratorpage.cpp =================================================================== --- trunk/krusader_kde4/krusader/Konfigurator/konfiguratorpage.cpp 2008-08-25 19:04:04 UTC (rev 6074) +++ trunk/krusader_kde4/krusader/Konfigurator/konfiguratorpage.cpp 2008-08-31 22:45:54 UTC (rev 6075) @@ -32,13 +32,14 @@ #include <qlayout.h> #include <QHBoxLayout> #include <QGridLayout> -#include <QFrame> +#include <QScrollArea> #include <QLabel> #include "../krusader.h" KonfiguratorPage::KonfiguratorPage( bool firstTime, QWidget* parent ) : - QFrame( parent ), firstCall( firstTime ) + QScrollArea( parent ), firstCall( firstTime ) { + setFrameStyle( QFrame::NoFrame ); } bool KonfiguratorPage::apply() Modified: trunk/krusader_kde4/krusader/Konfigurator/konfiguratorpage.h =================================================================== --- trunk/krusader_kde4/krusader/Konfigurator/konfiguratorpage.h 2008-08-25 19:04:04 UTC (rev 6074) +++ trunk/krusader_kde4/krusader/Konfigurator/konfiguratorpage.h 2008-08-31 22:45:54 UTC (rev 6075) @@ -32,11 +32,11 @@ #define __KONFIGURATOR_PAGE_H__ #include "konfiguratoritems.h" -#include <qframe.h> #include <qgroupbox.h> #include <qlabel.h> #include <qlayout.h> #include <QGridLayout> +#include <QScrollArea> struct KONFIGURATOR_CHECKBOX_PARAM; struct KONFIGURATOR_NAME_VALUE_TIP; @@ -48,7 +48,7 @@ * * @short The base class of a page in Konfigurator */ -class KonfiguratorPage : public QFrame +class KonfiguratorPage : public QScrollArea { Q_OBJECT This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |