Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-26 16:09:35 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed Left side ToolBar.

Browse Source 
Moved Info, About & Options to the Top ToolBar
Moved Add Friend Button to Friends Dialog

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7311 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2014-04-29 11:52:13 +00:00
parent d5af5e7a96
commit 06fe72e0d8
4 changed files with 43 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
retroshare-gui/src/gui/FriendsDialog.cpp
View File

@ -173,6 +173,12 @@ FriendsDialog::FriendsDialog(QWidget *parent)
//
// ui.menutoolButton->setMenu(menu);
QToolButton *addFriendButton = new QToolButton(this);
addFriendButton->setIcon(QIcon(":/images/user/add_user24.png"));
addFriendButton->setToolTip(tr("Add Friend"));
connect(addFriendButton, SIGNAL(clicked()), this, SLOT(addFriend()));
ui.friendList->addToolButton(addFriendButton);
setAcceptDrops(true);
ui.lineEdit->setAcceptDrops(false);
ui.hashBox->setDropWidget(this);

25
retroshare-gui/src/gui/MainWindow.cpp
View File

@ -229,21 +229,6 @@ MainWindow::MainWindow(QWidget* parent, Qt::WindowFlags flags)
applicationWindow->hide();
#endif
/** Left Side ToolBar**/
connect(actionAdd_Friend, SIGNAL(triggered() ), this , SLOT( addFriend() ) );
connect(actionAdd_Share, SIGNAL(triggered() ), this , SLOT( openShareManager() ) );
connect(actionOptions, SIGNAL(triggered()), this, SLOT( showSettings()) );
// connect(actionMessenger, SIGNAL(triggered()), this, SLOT( showMessengerWindow()) );
connect(actionServicePermissions, SIGNAL(triggered()), this, SLOT(servicePermission()));
actionMessenger->setVisible(false);
connect(actionAbout, SIGNAL(triggered()), this, SLOT( showabout()) );
//connect(actionColor, SIGNAL(triggered()), this, SLOT( setStyle()) );
/** adjusted quit behaviour: trigger a warning that can be switched off in the saved
config file RetroShare.conf */
connect(actionQuit, SIGNAL(triggered()), this, SLOT(doQuit()));
QList<QPair<MainPage*, QAction*> > notify;
@ -255,8 +240,6 @@ MainWindow::MainWindow(QWidget* parent, Qt::WindowFlags flags)
action = createPageAction(QIcon(IMAGE_NEWSFEED), tr("News feed"), grp));
notify.push_back(QPair<MainPage*, QAction*>(newsFeed, action));
// stackPages->add(networkDialog = new NetworkDialog(stackPages),
// createPageAction(QIcon(IMAGE_NETWORK2), tr("Network"), grp));
stackPages->add(friendsDialog = new FriendsDialog(stackPages),
action = createPageAction(QIcon(IMAGE_PEERS), tr("Network"), grp));
@ -270,9 +253,6 @@ MainWindow::MainWindow(QWidget* parent, Qt::WindowFlags flags)
stackPages->add(circlesDialog = new CirclesDialog(stackPages), createPageAction(QIcon(IMAGE_CIRCLES ), tr("Circles"), grp));
notify.push_back(QPair<MainPage*, QAction*>(circlesDialog, action));
// stackPages->add(searchDialog = new SearchDialog(stackPages),
// createPageAction(QIcon(IMAGE_SEARCH), tr("Search"), grp));
stackPages->add(transfersDialog = new TransfersDialog(stackPages),
action = createPageAction(QIcon(IMAGE_TRANSFERS), tr("File sharing"), grp));
notify.push_back(QPair<MainPage*, QAction*>(transfersDialog, action));
@ -356,6 +336,11 @@ MainWindow::MainWindow(QWidget* parent, Qt::WindowFlags flags)
addAction(new QAction(QIcon(IMAGE_UNFINISHED), tr("Unfinished"), toolBar), SLOT(showApplWindow()));
#endif
addAction(new QAction(QIcon(IMAGE_OPTIONS), tr("Options"), toolBar), SLOT(showSettings()));
addAction(new QAction(QIcon(IMAGE_ABOUT), tr("About"), toolBar), SLOT(showabout()));
addAction(new QAction(QIcon(IMAGE_QUIT), tr("Quit"), toolBar), SLOT(doQuit()));
stackPages->setCurrentIndex(Settings->getLastPageInMainWindow());
/** StatusBar section ********/

31
retroshare-gui/src/gui/MainWindow.ui
View File

@ -15,7 +15,16 @@
</property>
<widget class="QWidget" name="centralwidget">
<layout class="QGridLayout" name="gridLayout">
<property name="margin">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item row="0" column="0">
@ -38,26 +47,6 @@
<bool>false</bool>
</attribute>
</widget>
<widget class="QToolBar" name="toolBar_2">
<property name="contextMenuPolicy">
<enum>Qt::CustomContextMenu</enum>
</property>
<attribute name="toolBarArea">
<enum>LeftToolBarArea</enum>
</attribute>
<attribute name="toolBarBreak">
<bool>false</bool>
</attribute>
<addaction name="actionAdd_Friend"/>
<addaction name="actionAdd_Share"/>
<addaction name="actionServicePermissions"/>
<addaction name="separator"/>
<addaction name="actionMessenger"/>
<addaction name="actionAbout"/>
<addaction name="actionOptions"/>
<addaction name="separator"/>
<addaction name="actionQuit"/>
</widget>
<action name="actionAdd_Friend">
<property name="icon">
<iconset resource="images.qrc">

26
retroshare-gui/src/gui/common/FriendList.ui
View File

@ -14,7 +14,16 @@
<property name="spacing">
<number>0</number>
</property>
<property name="margin">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
@ -29,7 +38,16 @@
<property name="spacing">
<number>3</number>
</property>
<property name="margin">
<property name="leftMargin">
<number>2</number>
</property>
<property name="topMargin">
<number>2</number>
</property>
<property name="rightMargin">
<number>2</number>
</property>
<property name="bottomMargin">
<number>2</number>
</property>
<item>
@ -55,8 +73,8 @@
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>16</height>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="popupMode">