added icon for gpg key checkbox
clean up and removed not needed icons git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2291 b45a01b8-16f6-495d-af2f-9b41ad6348cc
|  | @ -19,7 +19,6 @@ | |||
|  *  Boston, MA  02110-1301, USA. | ||||
|  ****************************************************************/ | ||||
| 
 | ||||
| 
 | ||||
| #include <rshare.h> | ||||
| #include <rsiface/rsinit.h> | ||||
| #include "GenCertDialog.h" | ||||
|  | @ -30,7 +29,6 @@ | |||
| #include <QMovie> | ||||
| #include <time.h> | ||||
| 
 | ||||
| #include <util/WidgetBackgroundImage.h> | ||||
| 
 | ||||
| /* Define the format used for displaying the date and time */ | ||||
| #define DATETIME_FMT  "MMM dd hh:mm:ss" | ||||
|  | @ -44,9 +42,6 @@ GenCertDialog::GenCertDialog(QWidget *parent, Qt::WFlags flags) | |||
|   ui.setupUi(this); | ||||
| 
 | ||||
|   connect(ui.new_gpg_key_checkbox, SIGNAL(clicked()), this, SLOT(newGPGKeyGenUiSetup())); | ||||
| 
 | ||||
|   //WidgetBackgroundImage::setBackgroundImage(ui.loginLabel, ":images/new-account.png", WidgetBackgroundImage::AdjustSize);
 | ||||
| 
 | ||||
|    | ||||
|   connect(ui.genButton, SIGNAL(clicked()), this, SLOT(genPerson())); | ||||
|   connect(ui.infopushButton,SIGNAL(clicked()), this, SLOT(infodlg())); | ||||
|  |  | |||
|  | @ -7,7 +7,7 @@ | |||
|     <x>0</x> | ||||
|     <y>0</y> | ||||
|     <width>569</width> | ||||
|     <height>444</height> | ||||
|     <height>437</height> | ||||
|    </rect> | ||||
|   </property> | ||||
|   <property name="sizePolicy"> | ||||
|  | @ -721,6 +721,12 @@ border: 1px solid #CCCCCC;}</string> | |||
|          </item> | ||||
|          <item row="2" column="0"> | ||||
|           <widget class="QLabel" name="progress_label"> | ||||
|            <property name="maximumSize"> | ||||
|             <size> | ||||
|              <width>16777215</width> | ||||
|              <height>32</height> | ||||
|             </size> | ||||
|            </property> | ||||
|            <property name="text"> | ||||
|             <string/> | ||||
|            </property> | ||||
|  | @ -728,9 +734,28 @@ border: 1px solid #CCCCCC;}</string> | |||
|          </item> | ||||
|          <item row="1" column="0"> | ||||
|           <widget class="QCheckBox" name="new_gpg_key_checkbox"> | ||||
|            <property name="maximumSize"> | ||||
|             <size> | ||||
|              <width>16777215</width> | ||||
|              <height>32</height> | ||||
|             </size> | ||||
|            </property> | ||||
|            <property name="text"> | ||||
|             <string>Generate a new a new gpg key</string> | ||||
|            </property> | ||||
|            <property name="icon"> | ||||
|             <iconset resource="images.qrc"> | ||||
|              <normaloff>:/images/gpgp_key_generate.png</normaloff>:/images/gpgp_key_generate.png</iconset> | ||||
|            </property> | ||||
|            <property name="iconSize"> | ||||
|             <size> | ||||
|              <width>32</width> | ||||
|              <height>32</height> | ||||
|             </size> | ||||
|            </property> | ||||
|            <property name="tristate"> | ||||
|             <bool>false</bool> | ||||
|            </property> | ||||
|           </widget> | ||||
|          </item> | ||||
|          <item row="5" column="0"> | ||||
|  |  | |||
|  | @ -88,19 +88,6 @@ | |||
|         <file>images/button_cancel.png</file> | ||||
|         <file>images/calendar.png</file> | ||||
|         <file>images/chat.png</file> | ||||
|         <file>images/chat/bar_end.png</file> | ||||
|         <file>images/chat/bar_fill.png</file> | ||||
|         <file>images/chat/chat_emoticon_button.png</file> | ||||
|         <file>images/chat/chat_emoticon_button_on.png</file> | ||||
|         <file>images/chat/chat_send.png</file> | ||||
|         <file>images/chat/font_bold.png</file> | ||||
|         <file>images/chat/font_bold_on.png</file> | ||||
|         <file>images/chat/font_italic.png</file> | ||||
|         <file>images/chat/font_italic_on.png</file> | ||||
|         <file>images/chat/font_underline.png</file> | ||||
|         <file>images/chat/font_underline_on.png</file> | ||||
|         <file>images/chat/hide_avatar_frame.png</file> | ||||
|         <file>images/chat/show_avatar_frame.png</file> | ||||
|         <file>images/chats_24x24.png</file> | ||||
|         <file>images/cancel.png</file> | ||||
|         <file>images/close-down.png</file> | ||||
|  | @ -119,7 +106,6 @@ | |||
|         <file>images/ddeny.png</file> | ||||
|         <file>images/delete.png</file> | ||||
|         <file>images/deleteall.png</file> | ||||
|         <file>images/deletemail-hover.png</file> | ||||
|         <file>images/deletemail-pressed.png</file> | ||||
|         <file>images/deletemail24.png</file> | ||||
|         <file>images/dhidden.png</file> | ||||
|  | @ -186,7 +172,6 @@ | |||
|         <file>images/flags/sl.png</file> | ||||
|         <file>images/flags/tr.png</file> | ||||
|         <file>images/folder-draft.png</file> | ||||
|         <file>images/folder-draft24-hover.png</file> | ||||
|         <file>images/folder-draft24-pressed.png</file> | ||||
|         <file>images/folder-draft24.png</file> | ||||
|         <file>images/folder_inbox64.png</file> | ||||
|  | @ -211,6 +196,7 @@ | |||
|         <file>images/groupchat.png</file> | ||||
|         <file>images/genbackground.png</file> | ||||
|         <file>images/gohome.png</file> | ||||
|         <file>images/gpgp_key_generate.png</file> | ||||
|         <file>images/help.png</file> | ||||
|         <file>images/help24.png</file> | ||||
|         <file>images/hide_toolbox_frame.png</file> | ||||
|  | @ -284,8 +270,6 @@ | |||
|         <file>images/network.png</file> | ||||
|         <file>images/network16.png</file> | ||||
|         <file>images/network32.png</file> | ||||
|         <file>images/new-account.png</file> | ||||
|         <file>images/new-contact.png</file> | ||||
|         <file>images/new-mail-alert.png</file> | ||||
|         <file>images/new_forum16.png</file> | ||||
|         <file>images/nopic.png</file> | ||||
|  | @ -313,13 +297,11 @@ | |||
|         <file>images/records.png</file> | ||||
|         <file>images/removefriend16.png</file> | ||||
|         <file>images/replymail-pressed.png</file> | ||||
|         <file>images/replymail24-hover.png</file> | ||||
|         <file>images/replymail24.png</file> | ||||
|         <file>images/replymailall24-hover.png</file> | ||||
|         <file>images/reload24.png</file> | ||||
|         <file>images/reset.png</file> | ||||
|         <file>images/resume.png</file> | ||||
|         <file>images/retro4.png</file> | ||||
|         <file>images/RetroShare16.png</file> | ||||
|         <file>images/retrosharelogo1.png</file> | ||||
|         <file>images/retrosharelogo2.png</file> | ||||
|  |  | |||
| Before Width: | Height: | Size: 720 B | 
| Before Width: | Height: | Size: 245 B | 
| Before Width: | Height: | Size: 1.8 KiB | 
| Before Width: | Height: | Size: 1.7 KiB | 
| Before Width: | Height: | Size: 3.8 KiB | 
| Before Width: | Height: | Size: 851 B | 
| Before Width: | Height: | Size: 849 B | 
| Before Width: | Height: | Size: 692 B | 
| Before Width: | Height: | Size: 689 B | 
| Before Width: | Height: | Size: 831 B | 
| Before Width: | Height: | Size: 820 B | 
| Before Width: | Height: | Size: 981 B | 
| Before Width: | Height: | Size: 985 B | 
| Before Width: | Height: | Size: 849 B | 
| Before Width: | Height: | Size: 838 B | 
| Before Width: | Height: | Size: 2.8 KiB | 
| Before Width: | Height: | Size: 2.8 KiB | 
| Before Width: | Height: | Size: 1.5 KiB | 
| Before Width: | Height: | Size: 1.6 KiB | 
| Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 3.2 KiB | 
| Before Width: | Height: | Size: 34 KiB | 
| Before Width: | Height: | Size: 9.3 KiB | 
| Before Width: | Height: | Size: 1.5 KiB | 
| Before Width: | Height: | Size: 48 KiB | 
| Before Width: | Height: | Size: 48 KiB | 
 defnax
						defnax