Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-04 17:15:31 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

pass over AppearancePage to fit to the removal of tool buttons

Browse Source
This commit is contained in:
csoler 2017-02-15 21:50:53 +01:00
parent 7c8f8efbad
commit 3c75135f91
3 changed files with 60 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
retroshare-gui/src/gui/settings/AppearancePage.cpp
View File

@ -86,7 +86,7 @@ AppearancePage::AppearancePage(QWidget * parent, Qt::WindowFlags flags)
}
connect(ui.cmboTollButtonsSize, SIGNAL(currentIndexChanged(int)), this, SLOT(updateCmboToolButtonSize() ));
connect(ui.cmboListItemSize, SIGNAL(currentIndexChanged(int)), this, SLOT(updateCmboListItemSize() ));
// connect(ui.cmboListItemSize, SIGNAL(currentIndexChanged(int)), this, SLOT(updateCmboListItemSize() ));
connect(ui.cmboTollButtonsStyle, SIGNAL(currentIndexChanged(int)), this, SLOT(updateCmboToolButtonStyle()));
connect(ui.cmboLanguage, SIGNAL(currentIndexChanged(int)), this, SLOT(updateLanguageCode() ));
connect(ui.cmboStyle, SIGNAL(currentIndexChanged(int)), this, SLOT(updateInterfaceStyle() ));
@ -94,7 +94,7 @@ AppearancePage::AppearancePage(QWidget * parent, Qt::WindowFlags flags)
connect(ui.checkBoxDisableSysTrayToolTip, SIGNAL(toggled(bool)), this, SLOT(updateStatusToolTip() ));
connect(ui.mainPageButtonType_CB, SIGNAL(currentIndexChanged(int)), this, SLOT(updateRbtPageOnToolBar() ));
connect(ui.menuItemsButtonType_CB, SIGNAL(currentIndexChanged(int)), this, SLOT(updateActionButtonLoc() ));
// connect(ui.menuItemsButtonType_CB, SIGNAL(currentIndexChanged(int)), this, SLOT(updateActionButtonLoc() ));
}
void AppearancePage::switch_status_grpStatus(bool b) { switch_status(MainWindow::StatusGrpStatus ,"ShowStatusBar", b) ; }
@ -133,11 +133,7 @@ void AppearancePage::updateSheetName() { Settings->setSheetName(ui.cmboSt
void AppearancePage::updateRbtPageOnToolBar()
{
Settings->setPageButtonLoc(!ui.mainPageButtonType_CB->currentIndex());
NotifyQt::getInstance()->notifySettingsChanged();
}
void AppearancePage::updateActionButtonLoc()
{
Settings->setActionButtonLoc(!ui.menuItemsButtonType_CB->currentIndex());
Settings->setActionButtonLoc(!ui.mainPageButtonType_CB->currentIndex());
NotifyQt::getInstance()->notifySettingsChanged();
}
void AppearancePage::updateStatusToolTip() { MainWindow::getInstance()->toggleStatusToolTip(ui.checkBoxDisableSysTrayToolTip->isChecked()); }
@ -168,50 +164,56 @@ void AppearancePage::updateCmboToolButtonSize()
{
case 0:
Settings->setToolButtonSize(8);
break;
case 1:
Settings->setToolButtonSize(16);
break;
case 2:
default:
Settings->setToolButtonSize(24);
break;
case 3:
Settings->setToolButtonSize(32);
break;
case 4:
Settings->setToolButtonSize(64);
break;
case 5:
Settings->setToolButtonSize(128);
}
NotifyQt::getInstance()->notifySettingsChanged();
}
void AppearancePage::updateCmboListItemSize()
{
switch (ui.cmboListItemSize->currentIndex())
{
case 0:
Settings->setListItemIconSize(8);
break;
case 1:
Settings->setToolButtonSize(16);
Settings->setListItemIconSize(16);
break;
case 2:
default:
Settings->setToolButtonSize(24);
Settings->setListItemIconSize(24);
break;
case 3:
Settings->setToolButtonSize(32);
Settings->setListItemIconSize(32);
break;
case 4:
Settings->setToolButtonSize(64);
Settings->setListItemIconSize(64);
break;
case 5:
Settings->setToolButtonSize(128);
Settings->setListItemIconSize(128);
}
NotifyQt::getInstance()->notifySettingsChanged();
}
// void AppearancePage::updateCmboListItemSize()
// {
// switch (ui.cmboListItemSize->currentIndex())
// {
// case 0:
// Settings->setListItemIconSize(8);
// break;
// case 1:
// Settings->setListItemIconSize(16);
// break;
// case 2:
// default:
// Settings->setListItemIconSize(24);
// break;
// case 3:
// Settings->setListItemIconSize(32);
// break;
// case 4:
// Settings->setListItemIconSize(64);
// break;
// case 5:
// Settings->setListItemIconSize(128);
// }
// NotifyQt::getInstance()->notifySettingsChanged();
// }
void AppearancePage::updateStyle() { Rshare::setStyle(ui.cmboStyle->currentText()); }
@ -232,7 +234,7 @@ void AppearancePage::load()
ui.cmboStyleSheet->setCurrentIndex(index);
ui.mainPageButtonType_CB->setCurrentIndex(!Settings->getPageButtonLoc());
ui.menuItemsButtonType_CB->setCurrentIndex(!Settings->getActionButtonLoc());
// ui.menuItemsButtonType_CB->setCurrentIndex(!Settings->getActionButtonLoc());
switch (Settings->getToolButtonStyle())
{
@ -270,27 +272,27 @@ void AppearancePage::load()
case 128:
ui.cmboTollButtonsSize->setCurrentIndex(5);
}
switch (Settings->getListItemIconSize())
{
case 8:
ui.cmboListItemSize->setCurrentIndex(0);
break;
case 16:
ui.cmboListItemSize->setCurrentIndex(1);
break;
case 24:
default:
ui.cmboListItemSize->setCurrentIndex(2);
break;
case 32:
ui.cmboListItemSize->setCurrentIndex(3);
break;
case 64:
ui.cmboListItemSize->setCurrentIndex(4);
break;
case 128:
ui.cmboListItemSize->setCurrentIndex(5);
}
// switch (Settings->getListItemIconSize())
// {
// case 8:
// ui.cmboListItemSize->setCurrentIndex(0);
// break;
// case 16:
// ui.cmboListItemSize->setCurrentIndex(1);
// break;
// case 24:
// default:
// ui.cmboListItemSize->setCurrentIndex(2);
// break;
// case 32:
// ui.cmboListItemSize->setCurrentIndex(3);
// break;
// case 64:
// ui.cmboListItemSize->setCurrentIndex(4);
// break;
// case 128:
// ui.cmboListItemSize->setCurrentIndex(5);
// }
ui.grpStatus->setChecked(Settings->valueFromGroup("StatusBar", "ShowStatusBar", QVariant(true)).toBool());
ui.checkBoxStatusCompactMode->setChecked(Settings->valueFromGroup("StatusBar", "CompactMode", QVariant(false)).toBool());

4
retroshare-gui/src/gui/settings/AppearancePage.h
View File

@ -62,12 +62,12 @@ private slots:
void updateInterfaceStyle() ;
void updateSheetName() ;
void updateRbtPageOnToolBar();
void updateActionButtonLoc() ;
// void updateActionButtonLoc() ;
void updateStatusToolTip() ;
void updateCmboToolButtonStyle();
void updateCmboToolButtonSize();
void updateCmboListItemSize();
// void updateCmboListItemSize();
void updateStyle() ;
private:

87
retroshare-gui/src/gui/settings/AppearancePage.ui
View File

@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>1160</width>
<width>1170</width>
<height>897</height>
</rect>
</property>
@ -237,44 +237,6 @@
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="labelActionToolBar">
<property name="text">
<string>Menu items:</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="menuItemsButtonType_CB">
<item>
<property name="text">
<string>Buttons</string>
</property>
</item>
<item>
<property name="text">
<string>Item list</string>
</property>
</item>
</widget>
</item>
<item>
<spacer name="frameActionHSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>300</width>
<height>16</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<widget class="QFrame" name="frameToolListStyle">
<property name="sizePolicy">
@ -324,19 +286,6 @@
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="labelListItemStyle">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Choose the style of List Items.</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QComboBox" name="cmboTollButtonsSize">
<item>
@ -371,40 +320,6 @@
</item>
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="cmboListItemSize">
<item>
<property name="text">
<string>Icon Size = 8x8</string>
</property>
</item>
<item>
<property name="text">
<string>Icon Size = 16x16</string>
</property>
</item>
<item>
<property name="text">
<string>Icon Size = 24x24</string>
</property>
</item>
<item>
<property name="text">
<string>Icon Size = 32x32</string>
</property>
</item>
<item>
<property name="text">
<string>Icon Size = 64x64</string>
</property>
</item>
<item>
<property name="text">
<string>Icon Size = 128x128</string>
</property>
</item>
</widget>
</item>
</layout>
</widget>
</item>