Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #704 from G10h4ck/master

Browse Source 
Some consistence fixes in GUI
This commit is contained in:
csoler 2017-02-26 22:15:14 +01:00 committed by GitHub
commit 18cc77a384
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
retroshare-gui/src/gui/FriendsDialog.h
View File

@ -57,7 +57,7 @@ public:
~FriendsDialog (); ~FriendsDialog ();
virtual QIcon iconPixmap() const { return QIcon(IMAGE_NETWORK) ; } //MainPage virtual QIcon iconPixmap() const { return QIcon(IMAGE_NETWORK) ; } //MainPage
virtual QString pageName() const { return tr("Trusted nodes") ; } //MainPage virtual QString pageName() const { return tr("Network") ; } //MainPage
virtual QString helpText() const { return ""; } //MainPage virtual QString helpText() const { return ""; } //MainPage
virtual UserNotify *getUserNotify(QObject *parent); virtual UserNotify *getUserNotify(QObject *parent);

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

@ -361,13 +361,13 @@ void MainWindow::initStackedPage()
// addPage(circlesDialog = new CirclesDialog(ui->stackPages), grp, &notify); // addPage(circlesDialog = new CirclesDialog(ui->stackPages), grp, &notify);
//#endif //#endif
addPage(friendsDialog = new FriendsDialog(ui->stackPages), grp, &notify); addPage(friendsDialog = new FriendsDialog(ui->stackPages), grp, &notify);
addPage(idDialog = new IdDialog(ui->stackPages), grp, &notify);
addPage(chatLobbyDialog = new ChatLobbyWidget(ui->stackPages), grp, &notify); addPage(chatLobbyDialog = new ChatLobbyWidget(ui->stackPages), grp, &notify);
addPage(messagesDialog = new MessagesDialog(ui->stackPages), grp, &notify);
addPage(transfersDialog = new TransfersDialog(ui->stackPages), grp, &notify); addPage(transfersDialog = new TransfersDialog(ui->stackPages), grp, &notify);
addPage(gxschannelDialog = new GxsChannelDialog(ui->stackPages), grp, &notify); addPage(gxschannelDialog = new GxsChannelDialog(ui->stackPages), grp, &notify);
addPage(gxsforumDialog = new GxsForumsDialog(ui->stackPages), grp, &notify); addPage(gxsforumDialog = new GxsForumsDialog(ui->stackPages), grp, &notify);
addPage(messagesDialog = new MessagesDialog(ui->stackPages), grp, &notify);
addPage(postedDialog = new PostedDialog(ui->stackPages), grp, &notify); addPage(postedDialog = new PostedDialog(ui->stackPages), grp, &notify);
addPage(idDialog = new IdDialog(ui->stackPages), grp, &notify);
#ifdef RS_USE_NEW_PEOPLE_DIALOG #ifdef RS_USE_NEW_PEOPLE_DIALOG
PeopleDialog *peopleDialog = NULL; PeopleDialog *peopleDialog = NULL;

5
retroshare-gui/src/gui/NewsFeed.ui
View File

@ -69,7 +69,7 @@
<item> <item>
<widget class="StyledLabel" name="titleBarLabel"> <widget class="StyledLabel" name="titleBarLabel">
<property name="text"> <property name="text">
<string>News Feed</string> <string>Log entries</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -109,7 +109,7 @@
<enum>Qt::NoFocus</enum> <enum>Qt::NoFocus</enum>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="images.qrc"> <iconset resource="icons.qrc">
<normaloff>:/icons/help_64.png</normaloff>:/icons/help_64.png</iconset> <normaloff>:/icons/help_64.png</normaloff>:/icons/help_64.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
@ -155,7 +155,6 @@
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<resources> <resources>
<include location="images.qrc"/>
<include location="icons.qrc"/> <include location="icons.qrc"/>
</resources> </resources>
<connections/> <connections/>

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

@ -73,12 +73,15 @@
<property name="columnCount"> <property name="columnCount">
<number>3</number> <number>3</number>
</property> </property>
<attribute name="headerDefaultSectionSize">
<number>120</number>
</attribute>
<attribute name="headerStretchLastSection"> <attribute name="headerStretchLastSection">
<bool>false</bool> <bool>false</bool>
</attribute> </attribute>
<column> <column>
<property name="text"> <property name="text">
<string>Friend nodes</string> <string>Trusted nodes</string>
</property> </property>
<property name="textAlignment"> <property name="textAlignment">
<set>AlignCenter</set> <set>AlignCenter</set>