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

Fixing layout changes in Id Edit Dialog

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7113 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2014-02-13 11:55:14 +00:00
parent f818bb8e9a
commit b785132cbe
10 changed files with 89 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libretroshare/src/util/rsversion.cc
View File

@ -7,7 +7,7 @@
#include "rsversion.h" #include "rsversion.h"
#define LIB_VERSION "0.5.5c" #define LIB_VERSION "0.6.x"
std::string RsUtil::retroshareVersion() std::string RsUtil::retroshareVersion()
{ {

4
libretroshare/src/util/rsversion.h
View File

@ -11,8 +11,8 @@
// These versioning parameters are in the header because plugin versioning requires it. // These versioning parameters are in the header because plugin versioning requires it.
// Please use the functions below, and don't refer directly to the #defines. // Please use the functions below, and don't refer directly to the #defines.
#define SVN_REVISION "Revision 7062" #define SVN_REVISION "Revision 7106"
#define SVN_REVISION_NUMBER 7062 #define SVN_REVISION_NUMBER 7106
namespace RsUtil { namespace RsUtil {

2
retroshare-gui/src/gui/Identity/IdDialog.cpp
View File

@ -114,7 +114,7 @@ IdDialog::IdDialog(QWidget *parent)
connect(ui.toolButton_NewId, SIGNAL(clicked()), this, SLOT(addIdentity())); connect(ui.toolButton_NewId, SIGNAL(clicked()), this, SLOT(addIdentity()));
connect(ui.todoPushButton, SIGNAL(clicked()), this, SLOT(todo())); connect(ui.todoPushButton, SIGNAL(clicked()), this, SLOT(todo()));
connect(ui.toolButton_EditId, SIGNAL(clicked()), this, SLOT(editIdentity())); connect(ui.toolButton_EditId, SIGNAL(clicked()), this, SLOT(editIdentity()));
connect( ui.treeWidget_IdList, SIGNAL(itemSelectionChanged()), this, SLOT(updateSelection())); connect(ui.treeWidget_IdList, SIGNAL(itemSelectionChanged()), this, SLOT(updateSelection()));
connect(ui.filterComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(filterComboBoxChanged())); connect(ui.filterComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(filterComboBoxChanged()));
connect(ui.filterLineEdit, SIGNAL(textChanged(QString)), this, SLOT(filterChanged(QString))); connect(ui.filterLineEdit, SIGNAL(textChanged(QString)), this, SLOT(filterChanged(QString)));

2
retroshare-gui/src/gui/Identity/IdEditDialog.cpp
View File

@ -140,6 +140,8 @@ void IdEditDialog::updateIdType(bool pseudo)
void IdEditDialog::setupExistingId(std::string keyId) void IdEditDialog::setupExistingId(std::string keyId)
{ {
setWindowTitle(tr("Edit identity")); setWindowTitle(tr("Edit identity"));
ui.headerFrame->setHeaderImage(QPixmap(":/images/identity/user-properties_64.png"));
ui.headerFrame->setHeaderText(tr("Edit identity"));
mIsNew = false; mIsNew = false;

115
retroshare-gui/src/gui/Identity/IdEditDialog.ui
View File

@ -7,10 +7,16 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>510</width> <width>510</width>
<height>595</height> <height>462</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>0</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item> <item>
<widget class="HeaderFrame" name="headerFrame"> <widget class="HeaderFrame" name="headerFrame">
<property name="frameShape"> <property name="frameShape">
@ -23,6 +29,12 @@
</item> </item>
<item> <item>
<widget class="QFrame" name="frame"> <widget class="QFrame" name="frame">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::StyledPanel</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
@ -114,6 +126,19 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="0" colspan="2">
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
@ -126,119 +151,137 @@
<enum>QFrame::Raised</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0"> <item row="1" column="0">
<widget class="QLabel" name="label_Tag1"> <widget class="QLabel" name="label_Tag1">
<property name="text"> <property name="text">
<string>TextLabel</string> <string>TextLabel</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="1" column="1">
<widget class="QToolButton" name="toolButton_Tag1"> <widget class="QToolButton" name="toolButton_Tag1">
<property name="text"> <property name="text">
<string>RM</string> <string>RM</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="2" column="0">
<widget class="QLabel" name="label_Tag2"> <widget class="QLabel" name="label_Tag2">
<property name="text"> <property name="text">
<string>TextLabel</string> <string>TextLabel</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="2" column="1">
<widget class="QToolButton" name="toolButton_Tag2"> <widget class="QToolButton" name="toolButton_Tag2">
<property name="text"> <property name="text">
<string>RM</string> <string>RM</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="3" column="0">
<widget class="QLabel" name="label_Tag3"> <widget class="QLabel" name="label_Tag3">
<property name="text"> <property name="text">
<string>TextLabel</string> <string>TextLabel</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="3" column="1">
<widget class="QToolButton" name="toolButton_Tag3"> <widget class="QToolButton" name="toolButton_Tag3">
<property name="text"> <property name="text">
<string>RM</string> <string>RM</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0"> <item row="4" column="0">
<widget class="QLabel" name="label_Tag4"> <widget class="QLabel" name="label_Tag4">
<property name="text"> <property name="text">
<string>TextLabel</string> <string>TextLabel</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1"> <item row="4" column="1">
<widget class="QToolButton" name="toolButton_Tag4"> <widget class="QToolButton" name="toolButton_Tag4">
<property name="text"> <property name="text">
<string>RM</string> <string>RM</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0"> <item row="5" column="0">
<widget class="QLabel" name="label_Tag5"> <widget class="QLabel" name="label_Tag5">
<property name="text"> <property name="text">
<string>TextLabel</string> <string>TextLabel</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="1"> <item row="5" column="1">
<widget class="QToolButton" name="toolButton_Tag5"> <widget class="QToolButton" name="toolButton_Tag5">
<property name="text"> <property name="text">
<string>RM</string> <string>RM</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="0" colspan="2"> <item row="6" column="0" colspan="2">
<widget class="QPlainTextEdit" name="plainTextEdit_Tag"/> <widget class="QPlainTextEdit" name="plainTextEdit_Tag"/>
</item> </item>
<item row="6" column="0"> <item row="7" column="0">
<widget class="QLabel" name="label_TagCheck"> <widget class="QLabel" name="label_TagCheck">
<property name="text"> <property name="text">
<string>TextLabel</string> <string>TextLabel</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="1"> <item row="7" column="1">
<widget class="QPushButton" name="pushButton_Tag"> <widget class="QPushButton" name="pushButton_Tag">
<property name="text"> <property name="text">
<string>Add</string> <string>Add</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_2"> <widget class="QFrame" name="frame">
<item> <layout class="QHBoxLayout" name="horizontalLayout_2">
<spacer name="horizontalSpacer"> <property name="margin">
<property name="orientation"> <number>6</number>
<enum>Qt::Horizontal</enum> </property>
</property> <item>
<property name="sizeHint" stdset="0"> <spacer name="horizontalSpacer">
<size> <property name="orientation">
<width>328</width> <enum>Qt::Horizontal</enum>
<height>20</height> </property>
</size> <property name="sizeHint" stdset="0">
</property> <size>
</spacer> <width>328</width>
</item> <height>20</height>
<item> </size>
<widget class="QDialogButtonBox" name="buttonBox"> </property>
<property name="standardButtons"> </spacer>
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> </item>
</property> <item>
</widget> <widget class="QDialogButtonBox" name="buttonBox">
</item> <property name="standardButtons">
</layout> <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout>
</widget>
</item> </item>
</layout> </layout>
</widget> </widget>

1
retroshare-gui/src/gui/images.qrc
View File

@ -546,6 +546,7 @@
<file>images/identity/list-add-user_64.png</file> <file>images/identity/list-add-user_64.png</file>
<file>images/identity/list-remove-user_32.png</file> <file>images/identity/list-remove-user_32.png</file>
<file>images/identity/user-properties_32.png</file> <file>images/identity/user-properties_32.png</file>
<file>images/identity/user-properties_64.png</file>
<file>qss/chat/standard/private/info.xml</file> <file>qss/chat/standard/private/info.xml</file>
<file>qss/chat/standard/private/incoming.htm</file> <file>qss/chat/standard/private/incoming.htm</file>
<file>qss/chat/standard/private/outgoing.htm</file> <file>qss/chat/standard/private/outgoing.htm</file>

BIN
retroshare-gui/src/gui/images/identity/user-properties_128.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB

BIN
retroshare-gui/src/gui/images/identity/user-properties_64.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.0 KiB

4
retroshare-gui/src/util/rsguiversion.h
View File

@ -24,8 +24,8 @@
QString retroshareVersion(); QString retroshareVersion();
QString retroshareRevision(); QString retroshareRevision();
#define GUI_VERSION "0.5.5c" #define GUI_VERSION "0.6.x"
#define GUI_REVISION "Revision: 7062" #define GUI_REVISION "Revision: 7106"

2
retroshare-gui/src/util/rsguiversion.in
View File

@ -24,7 +24,7 @@
QString retroshareVersion(); QString retroshareVersion();
QString retroshareRevision(); QString retroshareRevision();
#define GUI_VERSION "0.5.5c" #define GUI_VERSION "0.6.x"
#define GUI_REVISION "Revision: $WCREV$" #define GUI_REVISION "Revision: $WCREV$"