sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-01 00:46:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove option for custom side bar style, always on now

Browse Source
This commit is contained in:
Nyall Dawson 2015-05-21 21:13:43 +10:00
parent daee595366
commit de3377bca9
4 changed files with 16 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/app/qgisappstylesheet.cpp
View File

@ -89,8 +89,6 @@ QMap<QString, QVariant> QgisAppStyleSheet::defaultOptions()
bool gbxCustom = ( mMacStyle ? true : false );
opts.insert( "groupBoxCustom", settings.value( "groupBoxCustom", QVariant( gbxCustom ) ) );
opts.insert( "sidebarStyle", settings.value( "sidebarStyle", true ) );
settings.endGroup(); // "qgis/stylesheet"
return opts;
@ -116,8 +114,6 @@ void QgisAppStyleSheet::buildStyleSheet( const QMap<QString, QVariant>& opts )
bool gbxCustom = opts.value( "groupBoxCustom" ).toBool();
QgsDebugMsg( QString( "groupBoxCustom: %1" ).arg( gbxCustom ) );
bool sidebar = opts.value( "sidebarStyle" ).toBool();
ss += "QGroupBox{";
// doesn't work for QGroupBox::title
ss += QString( "color: rgb(%1,%1,%1);" ).arg( mMacStyle ? 25 : 60 );
@ -151,31 +147,21 @@ void QgisAppStyleSheet::buildStyleSheet( const QMap<QString, QVariant>& opts )
ss += "} ";
}
if ( sidebar )
{
QString style = "QListWidget#mOptionsListWidget {"
" background-color: rgb(69, 69, 69, 220);"
" outline: 0;"
"}"
"QListWidget#mOptionsListWidget::item {"
" color: white;"
" padding: 3px;"
"}"
"QListWidget#mOptionsListWidget::item::selected {"
" color: black;"
" background-color:palette(Window);"
" padding-right: 0px;"
"}";
ss += style;
}
//fix background issue for gnome desktop
if ( mLinuxOS && mGtkStyle && !sidebar )
{
ss += "QListWidget#mOptionsListWidget{";
ss += "background-color: white;";
ss += "} ";
}
//sidebar style
QString style = "QListWidget#mOptionsListWidget {"
" background-color: rgb(69, 69, 69, 220);"
" outline: 0;"
"}"
"QListWidget#mOptionsListWidget::item {"
" color: white;"
" padding: 3px;"
"}"
"QListWidget#mOptionsListWidget::item::selected {"
" color: black;"
" background-color:palette(Window);"
" padding-right: 0px;"
"}";
ss += style;
// Fix selection color on loosing focus (Windows)
const QPalette palette = qApp->palette();

7
src/app/qgsoptions.cpp
View File

@ -513,7 +513,6 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl ) :
// custom group boxes
mCustomGroupBoxChkBx->setChecked( mStyleSheetOldOpts.value( "groupBoxCustom" ).toBool() );
mCustomSideBarSide->setChecked( mStyleSheetOldOpts.value( "sidebarStyle" ).toBool() );
mMessageTimeoutSpnBx->setValue( settings.value( "/qgis/messageTimeout", 5 ).toInt() );
@ -1394,12 +1393,6 @@ void QgsOptions::on_mCustomGroupBoxChkBx_clicked( bool chkd )
mStyleSheetBuilder->buildStyleSheet( mStyleSheetNewOpts );
}
void QgsOptions::on_mCustomSideBarSide_clicked( bool chkd )
{
mStyleSheetNewOpts.insert( "sidebarStyle", chkd );
mStyleSheetBuilder->buildStyleSheet( mStyleSheetNewOpts );
}
void QgsOptions::on_leProjectGlobalCrs_crsChanged( QgsCoordinateReferenceSystem crs )
{
mDefaultCrs = crs;

5
src/app/qgsoptions.h
View File

@ -103,11 +103,6 @@ class APP_EXPORT QgsOptions : public QgsOptionsDialogBase, private Ui::QgsOption
/** Slot to set whether to use custom group boxes */
void on_mCustomGroupBoxChkBx_clicked( bool chkd );
/** Slot to set whether to use custom side bar style
* @note added in QGIS 2.2
*/
void on_mCustomSideBarSide_clicked( bool chkd );
void on_mProxyTypeComboBox_currentIndexChanged( int idx );
/**Add a new URL to exclude from Proxy*/

10
src/ui/qgsoptionsbase.ui
View File

@ -310,7 +310,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>635</width>
<width>610</width>
<height>635</height>
</rect>
</property>
@ -600,13 +600,6 @@
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_32">
<item>
<widget class="QCheckBox" name="mCustomSideBarSide">
<property name="text">
<string>Custom side bar style</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="cbxCanvasRotation">
<property name="text">
@ -4929,7 +4922,6 @@
<tabstop>mCustomGroupBoxChkBx</tabstop>
<tabstop>mNativeColorDialogsChkBx</tabstop>
<tabstop>mLiveColorDialogsChkBx</tabstop>
<tabstop>mCustomSideBarSide</tabstop>
<tabstop>cbxCanvasRotation</tabstop>
<tabstop>mProjectOnLaunchCmbBx</tabstop>
<tabstop>mProjectOnLaunchLineEdit</tabstop>