mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-08 00:55:13 -04:00
-added new Preferences Dialog for Appearance
-moved some Settings from General to Appearance ( Language, Style, stylesheet -added checkbox for Start RetroShare with System start in GeneralDialog -moved Rsharesettings to Preferences folder to find bether -added new RSettings source -clean uped some old code stuff in MainWindow which is not more needed -replaced in MainWindow PreferencesWindows open function with new one. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@684 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
4e43cb2f09
commit
c84f34e916
28 changed files with 1779 additions and 490 deletions
|
@ -505,17 +505,16 @@
|
|||
<enum>Qt::ToolButtonIconOnly</enum>
|
||||
</property>
|
||||
<widget class="QWidget" name="centralwidget" >
|
||||
<property name="geometry" >
|
||||
<rect>
|
||||
<x>35</x>
|
||||
<y>12</y>
|
||||
<width>753</width>
|
||||
<height>567</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QGridLayout" >
|
||||
<property name="leftMargin" >
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="topMargin" >
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="rightMargin" >
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="bottomMargin" >
|
||||
<property name="margin" >
|
||||
<number>0</number>
|
||||
</property>
|
||||
<item row="0" column="0" >
|
||||
|
@ -1014,8 +1013,25 @@
|
|||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QStatusBar" name="statusbar" />
|
||||
<widget class="QStatusBar" name="statusbar" >
|
||||
<property name="geometry" >
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>579</y>
|
||||
<width>800</width>
|
||||
<height>21</height>
|
||||
</rect>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QToolBar" name="toolBar" >
|
||||
<property name="geometry" >
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>800</width>
|
||||
<height>12</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="contextMenuPolicy" >
|
||||
<enum>Qt::NoContextMenu</enum>
|
||||
</property>
|
||||
|
@ -1045,11 +1061,19 @@
|
|||
</attribute>
|
||||
</widget>
|
||||
<widget class="QToolBar" name="toolBarservice" >
|
||||
<property name="geometry" >
|
||||
<rect>
|
||||
<x>788</x>
|
||||
<y>12</y>
|
||||
<width>12</width>
|
||||
<height>567</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle" >
|
||||
<string/>
|
||||
</property>
|
||||
<property name="allowedAreas" >
|
||||
<set>Qt::BottomToolBarArea|Qt::LeftToolBarArea|Qt::NoToolBarArea|Qt::RightToolBarArea</set>
|
||||
<set>Qt::BottomToolBarArea|Qt::LeftToolBarArea|Qt::RightToolBarArea</set>
|
||||
</property>
|
||||
<property name="iconSize" >
|
||||
<size>
|
||||
|
@ -1068,6 +1092,14 @@
|
|||
<property name="enabled" >
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="geometry" >
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>12</y>
|
||||
<width>35</width>
|
||||
<height>567</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle" >
|
||||
<string>toolBar_2</string>
|
||||
</property>
|
||||
|
@ -1098,7 +1130,8 @@
|
|||
</widget>
|
||||
<action name="actionAdd_Friend" >
|
||||
<property name="icon" >
|
||||
<iconset resource="images.qrc" >:/images/add-friend24.png</iconset>
|
||||
<iconset resource="images.qrc" >
|
||||
<normaloff>:/images/add-friend24.png</normaloff>:/images/add-friend24.png</iconset>
|
||||
</property>
|
||||
<property name="text" >
|
||||
<string>Add Friend</string>
|
||||
|
@ -1106,7 +1139,8 @@
|
|||
</action>
|
||||
<action name="actionInvite_Friend" >
|
||||
<property name="icon" >
|
||||
<iconset resource="images.qrc" >:/images/invite-friend24.png</iconset>
|
||||
<iconset resource="images.qrc" >
|
||||
<normaloff>:/images/invite-friend24.png</normaloff>:/images/invite-friend24.png</iconset>
|
||||
</property>
|
||||
<property name="text" >
|
||||
<string>Invite Friend</string>
|
||||
|
@ -1114,7 +1148,8 @@
|
|||
</action>
|
||||
<action name="actionAdd_Share" >
|
||||
<property name="icon" >
|
||||
<iconset resource="images.qrc" >:/images/add-share24.png</iconset>
|
||||
<iconset resource="images.qrc" >
|
||||
<normaloff>:/images/add-share24.png</normaloff>:/images/add-share24.png</iconset>
|
||||
</property>
|
||||
<property name="text" >
|
||||
<string>Add Share</string>
|
||||
|
@ -1122,7 +1157,8 @@
|
|||
</action>
|
||||
<action name="actionOptions" >
|
||||
<property name="icon" >
|
||||
<iconset resource="images.qrc" >:/images/settings.png</iconset>
|
||||
<iconset resource="images.qrc" >
|
||||
<normaloff>:/images/kcmsystem24.png</normaloff>:/images/kcmsystem24.png</iconset>
|
||||
</property>
|
||||
<property name="text" >
|
||||
<string>Options</string>
|
||||
|
@ -1130,7 +1166,8 @@
|
|||
</action>
|
||||
<action name="actionQuit" >
|
||||
<property name="icon" >
|
||||
<iconset resource="images.qrc" >:/images/exit_24x24.png</iconset>
|
||||
<iconset resource="images.qrc" >
|
||||
<normaloff>:/images/exit_24x24.png</normaloff>:/images/exit_24x24.png</iconset>
|
||||
</property>
|
||||
<property name="text" >
|
||||
<string>Quit</string>
|
||||
|
@ -1141,7 +1178,8 @@
|
|||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="icon" >
|
||||
<iconset resource="images.qrc" >:/images/highlight.png</iconset>
|
||||
<iconset resource="images.qrc" >
|
||||
<normaloff>:/images/highlight.png</normaloff>:/images/highlight.png</iconset>
|
||||
</property>
|
||||
<property name="text" >
|
||||
<string>Color</string>
|
||||
|
@ -1152,7 +1190,8 @@
|
|||
</action>
|
||||
<action name="actionSMPlayer" >
|
||||
<property name="icon" >
|
||||
<iconset resource="images.qrc" >:/images/smplayer_icon32.png</iconset>
|
||||
<iconset resource="images.qrc" >
|
||||
<normaloff>:/images/smplayer_icon32.png</normaloff>:/images/smplayer_icon32.png</iconset>
|
||||
</property>
|
||||
<property name="text" >
|
||||
<string>SMPlayer</string>
|
||||
|
@ -1160,7 +1199,8 @@
|
|||
</action>
|
||||
<action name="actionMessenger" >
|
||||
<property name="icon" >
|
||||
<iconset resource="images.qrc" >:/images/kdmconfig.png</iconset>
|
||||
<iconset resource="images.qrc" >
|
||||
<normaloff>:/images/kdmconfig.png</normaloff>:/images/kdmconfig.png</iconset>
|
||||
</property>
|
||||
<property name="text" >
|
||||
<string>Messenger</string>
|
||||
|
@ -1168,7 +1208,8 @@
|
|||
</action>
|
||||
<action name="actionAbout" >
|
||||
<property name="icon" >
|
||||
<iconset resource="images.qrc" >:/images/informations_24x24.png</iconset>
|
||||
<iconset resource="images.qrc" >
|
||||
<normaloff>:/images/informations_24x24.png</normaloff>:/images/informations_24x24.png</iconset>
|
||||
</property>
|
||||
<property name="text" >
|
||||
<string>About</string>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue