Added some icons for the Wiki Pages Dialog.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5831 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2012-11-16 16:41:59 +00:00
parent eb23479611
commit c5fee54ee7
23 changed files with 1053 additions and 877 deletions

View File

@ -708,7 +708,7 @@ SOURCES += main.cpp \
RESOURCES += gui/images.qrc lang/lang.qrc gui/help/content/content.qrc
RESOURCES += gui/images.qrc lang/lang.qrc gui/help/content/content.qrc gui/WikiPoos/Wiki_images.qrc
TRANSLATIONS += \
lang/retroshare_en.ts \

View File

@ -700,38 +700,6 @@ p, li { white-space: pre-wrap; }
<layout class="QGridLayout">
<item row="1" column="0">
<layout class="QHBoxLayout">
<item>
<widget class="QLabel" name="label_17">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="font">
<font>
<pointsize>10</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Forum:</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="forumName">
<property name="sizePolicy">
@ -753,11 +721,7 @@ p, li { white-space: pre-wrap; }
</size>
</property>
<property name="styleSheet">
<string notr="true">
border: 2px solid #CCCCCC;
border-radius:6px;
background: white;
</string>
<string notr="true"/>
</property>
<property name="text">
<string/>
@ -835,44 +799,8 @@ background: white;
</column>
</widget>
</item>
<item row="5" column="0">
<item row="6" column="0">
<layout class="QGridLayout">
<item row="0" column="1">
<widget class="QLabel" name="threadlabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>10</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Thread:</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QLabel" name="threadTitle">
<property name="styleSheet">
<string notr="true">QLabel#threadTitle{
border: 2px solid #CCCCCC;
border-radius: 6px;
background: white;}</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
<item row="0" column="3">
<widget class="QPushButton" name="previousButton">
<property name="enabled">
@ -949,7 +877,7 @@ background: white;}</string>
</property>
</widget>
</item>
<item row="0" column="7">
<item row="0" column="8">
<widget class="QPushButton" name="expandButton">
<property name="maximumSize">
<size>
@ -975,7 +903,7 @@ background: white;}</string>
</property>
</widget>
</item>
<item row="0" column="6">
<item row="0" column="7">
<widget class="QPushButton" name="downloadButton">
<property name="maximumSize">
<size>
@ -995,7 +923,7 @@ background: white;}</string>
</property>
</widget>
</item>
<item row="0" column="5">
<item row="0" column="6">
<widget class="QPushButton" name="nextUnreadButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
@ -1008,6 +936,42 @@ background: white;}</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QToolButton" name="newmessageButton">
<property name="maximumSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="toolTip">
<string>Reply Message</string>
</property>
<property name="icon">
<iconset resource="images.qrc">
<normaloff>:/images/mail_reply.png</normaloff>:/images/mail_reply.png</iconset>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="5">
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item row="0" column="0">
@ -1097,29 +1061,6 @@ border: 1px solid #CCCCCC;}</string>
</item>
</widget>
</item>
<item row="0" column="1">
<widget class="QToolButton" name="newmessageButton">
<property name="maximumSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="toolTip">
<string>Reply Message</string>
</property>
<property name="icon">
<iconset resource="images.qrc">
<normaloff>:/images/mail_reply.png</normaloff>:/images/mail_reply.png</iconset>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="2">
<spacer name="horizontalSpacer">
<property name="orientation">
@ -1196,6 +1137,19 @@ border: 1px solid #CCCCCC;}</string>
</item>
</layout>
</item>
<item row="5" column="0">
<widget class="QLabel" name="threadTitle">
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="LinkTextBrowser" name="postText">

View File

@ -6,19 +6,93 @@
<rect>
<x>0</x>
<y>0</y>
<width>774</width>
<height>608</height>
<width>902</width>
<height>669</height>
</rect>
</property>
<property name="windowTitle">
<string/>
</property>
<layout class="QVBoxLayout" name="verticalLayout_8">
<item>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QSplitter" name="splitter_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<widget class="QWidget" name="layoutWidget">
<layout class="QVBoxLayout" name="verticalLayout_6">
<property name="spacing">
<number>0</number>
</property>
<item>
<widget class="QFrame" name="frame_2">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="margin">
<number>3</number>
</property>
<item>
<widget class="QLabel" name="label">
<property name="maximumSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="Wiki_images.qrc">:/images/book2_32.png</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_2">
<property name="font">
<font>
<pointsize>10</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Wiki Pages</string>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="toolButton_NewGroup">
<property name="text">
<string>New Group</string>
</property>
<property name="icon">
<iconset resource="Wiki_images.qrc">
<normaloff>:/images/resource-group-new.png</normaloff>:/images/resource-group-new.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QSplitter" name="splitter">
<property name="orientation">
<enum>Qt::Vertical</enum>
@ -32,8 +106,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>205</width>
<height>285</height>
<width>255</width>
<height>301</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
@ -68,8 +142,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>205</width>
<height>284</height>
<width>255</width>
<height>301</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
@ -91,8 +165,14 @@
</widget>
</widget>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="layoutWidget">
<layout class="QVBoxLayout" name="verticalLayout_5">
<property name="spacing">
<number>0</number>
</property>
<item>
<widget class="QFrame" name="frame">
<property name="frameShape">
@ -102,6 +182,9 @@
<enum>QFrame::Raised</enum>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="margin">
<number>2</number>
</property>
<item>
<widget class="QToolButton" name="toolButton_PrevPage">
<property name="enabled">
@ -110,6 +193,16 @@
<property name="text">
<string>&lt;&lt;</string>
</property>
<property name="icon">
<iconset resource="Wiki_images.qrc">
<normaloff>:/images/arrow-left.png</normaloff>:/images/arrow-left.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
</widget>
</item>
<item>
@ -120,6 +213,16 @@
<property name="text">
<string>&gt;&gt;</string>
</property>
<property name="icon">
<iconset resource="Wiki_images.qrc">
<normaloff>:/images/arrow-right.png</normaloff>:/images/arrow-right.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
</widget>
</item>
<item>
@ -129,13 +232,39 @@
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QToolButton" name="toolButton_PrevMod">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>&lt;&lt; Mod</string>
<string>Mod</string>
</property>
<property name="icon">
<iconset resource="Wiki_images.qrc">
<normaloff>:/images/arrow-left.png</normaloff>:/images/arrow-left.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
</property>
</widget>
</item>
@ -144,6 +273,19 @@
<property name="text">
<string>Republish</string>
</property>
<property name="icon">
<iconset resource="Wiki_images.qrc">
<normaloff>:/images/republish.png</normaloff>:/images/republish.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
</property>
</widget>
</item>
<item>
@ -151,6 +293,19 @@
<property name="text">
<string>Edit</string>
</property>
<property name="icon">
<iconset resource="Wiki_images.qrc">
<normaloff>:/images/story-editor.png</normaloff>:/images/story-editor.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
</property>
</widget>
</item>
<item>
@ -159,7 +314,20 @@
<bool>false</bool>
</property>
<property name="text">
<string>Mod &gt;&gt;</string>
<string>Mod</string>
</property>
<property name="icon">
<iconset resource="Wiki_images.qrc">
<normaloff>:/images/arrow-right.png</normaloff>:/images/arrow-right.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
</property>
</widget>
</item>
@ -170,18 +338,24 @@
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="toolButton_NewGroup">
<property name="text">
<string>New Group</string>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="toolButton_NewPage">
<property name="text">
<string>New Page</string>
</property>
<property name="icon">
<iconset resource="Wiki_images.qrc">
<normaloff>:/images/appointment-new.png</normaloff>:/images/appointment-new.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
</property>
</widget>
</item>
<item>
@ -192,6 +366,19 @@
<property name="text">
<string>Refresh</string>
</property>
<property name="icon">
<iconset resource="Wiki_images.qrc">
<normaloff>:/images/republish.png</normaloff>:/images/republish.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
</property>
</widget>
</item>
</layout>
@ -210,8 +397,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>528</width>
<height>511</height>
<width>616</width>
<height>611</height>
</rect>
</property>
<property name="styleSheet">

View File

@ -13,8 +13,33 @@
<property name="windowTitle">
<string/>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QGridLayout" name="gridLayout_3">
<property name="verticalSpacing">
<number>0</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QFrame" name="headerFrame">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QFrame" name="frame">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Wiki Page</string>
@ -120,10 +145,10 @@
</layout>
</widget>
</item>
<item>
<item row="1" column="0">
<widget class="QTextEdit" name="textEdit"/>
</item>
<item>
<item row="2" column="0">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QPushButton" name="pushButton_Cancel">
@ -163,6 +188,9 @@
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<resources>
<include location="Wiki_images.qrc"/>
</resources>

View File

@ -1,5 +1,12 @@
<RCC>
<qresource prefix="/" >
<file>images/dummy.png</file>
<file>images/arrow-left.png</file>
<file>images/arrow-right.png</file>
<file>images/resource-group-new.png</file>
<file>images/appointment-new.png</file>
<file>images/book2_32.png</file>
<file>images/story-editor.png</file>
<file>images/republish.png</file>
<file>images/resource-group-new_48.png</file>
</qresource>
</RCC>

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1019 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1006 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 786 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

View File

@ -64,6 +64,9 @@ GxsGroupDialog::GxsGroupDialog(TokenQueue *tokenQueue, uint32_t enableFlags, uin
connect( ui.groupLogo, SIGNAL(clicked() ), this , SLOT(addGroupLogo()));
connect( ui.addLogoButton, SIGNAL(clicked() ), this , SLOT(addGroupLogo()));
//ui.headerFrame->setHeaderImage(QPixmap(":/WikiPoos/images/resource-group-new_48.png"));
//ui.headerFrame->setHeaderText(tr("Create Wiki Group"));
if (!ui.pubKeyShare_cb->isChecked())
{
ui.contactsdockWidget->hide();

View File

@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Create new Forum</string>
<string>Create new Wiki Group</string>
</property>
<property name="windowIcon">
<iconset resource="../images.qrc">
@ -25,15 +25,20 @@
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QFrame" name="frame_2">
<widget class="QFrame" name="headerFrame">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>64</height>
</size>
</property>
<property name="font">
<font>
<pointsize>11</pointsize>
</font>
</property>
<property name="styleSheet">
<string notr="true">QFrame#frame_2{background-image: url(:/images/connect/connectFriendBanner.png);}</string>
<string notr="true"/>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
@ -46,38 +51,25 @@
<number>6</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="labelicon">
<widget class="QLabel" name="label_2">
<property name="maximumSize">
<size>
<width>48</width>
<height>48</height>
</size>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="../images.qrc">:/images/konversation64.png</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
<pixmap resource="../WikiPoos/Wiki_images.qrc">:/images/resource-group-new_48.png</pixmap>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="textlabelcreatforums">
<property name="styleSheet">
<string notr="true">color: rgb(255, 255, 255);</string>
</property>
<widget class="QLabel" name="label_3">
<property name="text">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Arial'; font-size:24pt; font-weight:600; color:#ffffff;&quot;&gt;New Group&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>Create Wiki Group</string>
</property>
</widget>
</item>
@ -191,10 +183,14 @@ border-radius: 10px;
<item>
<widget class="QCheckBox" name="pubKeyShare_cb">
<property name="toolTip">
<string>Key recipients can publish to restricted-type channels, and can view and publish for private-type channels</string>
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Key recipients can publish to restricted-type Wiki Group, and can view and publish for private-type channels&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Share Publish Key</string>
<string>Add Wiki Moderators</string>
</property>
</widget>
</item>
@ -244,7 +240,7 @@ border-radius: 10px;
<set>QDockWidget::NoDockWidgetFeatures</set>
</property>
<property name="windowTitle">
<string>Share Key With</string>
<string>Select Wiki Moderators</string>
</property>
<widget class="QWidget" name="dockWidgetContents">
<layout class="QGridLayout" name="_2">
@ -555,6 +551,7 @@ border-radius: 10px;
</customwidgets>
<resources>
<include location="../images.qrc"/>
<include location="../WikiPoos/Wiki_images.qrc"/>
</resources>
<connections/>
</ui>