added some actions for photo view

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2509 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2010-03-10 13:35:58 +00:00
parent f400d8f4cc
commit 0b4bc0f2eb
12 changed files with 134 additions and 74 deletions

View File

@ -281,6 +281,7 @@
<file>images/newmsg.png</file> <file>images/newmsg.png</file>
<file>images/no_avatar.png</file> <file>images/no_avatar.png</file>
<file>images/no_avatar_70.png</file> <file>images/no_avatar_70.png</file>
<file>images/openimage.png</file>
<file>images/pasterslink.png</file> <file>images/pasterslink.png</file>
<file>images/package_games1.png</file> <file>images/package_games1.png</file>
<file>images/peerdetails_16x16.png</file> <file>images/peerdetails_16x16.png</file>
@ -300,6 +301,13 @@
<file>images/greenled.png</file> <file>images/greenled.png</file>
<file>images/grayled.png</file> <file>images/grayled.png</file>
<file>images/yellowled.png</file> <file>images/yellowled.png</file>
<file>images/rate-1.png</file>
<file>images/rate-2.png</file>
<file>images/rate-3.png</file>
<file>images/rate-4.png</file>
<file>images/rate-5.png</file>
<file>images/rating.png</file>
<file>images/records.png</file>
<file>images/records.png</file> <file>images/records.png</file>
<file>images/removefriend16.png</file> <file>images/removefriend16.png</file>
<file>images/replymail-pressed.png</file> <file>images/replymail-pressed.png</file>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 840 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 742 B

View File

@ -158,12 +158,53 @@ void PhotoDialog::photoTreeWidgetCustomPopupMenu( QPoint point )
QMenu contextMnu( this ); QMenu contextMnu( this );
QMouseEvent *mevent = new QMouseEvent( QEvent::MouseButtonPress, point, Qt::RightButton, Qt::RightButton, Qt::NoModifier ); QMouseEvent *mevent = new QMouseEvent( QEvent::MouseButtonPress, point, Qt::RightButton, Qt::RightButton, Qt::NoModifier );
QAction *rm = new QAction(QIcon(IMAGE_REMOVE), tr( "Remove" ), this ); QAction *openphotoAct = new QAction(QIcon(":/images/openimage.png"), tr( "Open" ), this );
connect( rm , SIGNAL( triggered() ), this, SLOT( removePhoto() ) ); openphotoAct->setShortcut(Qt::CTRL + Qt::Key_O);
connect( openphotoAct , SIGNAL( triggered(QTreeWidgetItem * , int) ), this, SLOT( showPhoto( QTreeWidgetItem *, int ) ) );
QAction *removephotoAct = new QAction(QIcon(IMAGE_REMOVE), tr( "Remove" ), this );
removephotoAct->setShortcut(Qt::Key_Delete);
connect( removephotoAct , SIGNAL( triggered() ), this, SLOT( removePhoto() ) );
rateExcellenAct = new QAction(QIcon(":/images/rate-5.png"), tr("Excellent"), this);
rateExcellenAct->setShortcut(Qt::CTRL + Qt::Key_5);
connect(rateExcellenAct, SIGNAL(triggered()), this, SLOT(rateExcellent()));
rateGoodAct = new QAction(QIcon(":/images/rate-4.png"), tr("Good"), this);
rateGoodAct->setShortcut(Qt::CTRL + Qt::Key_4);
connect(rateGoodAct, SIGNAL(triggered()), this, SLOT(rateGood()));
rateAverageAct = new QAction(QIcon(":/images/rate-3.png"), tr("Average"), this);
rateAverageAct->setShortcut(Qt::CTRL + Qt::Key_3);
connect(rateAverageAct, SIGNAL(triggered()), this, SLOT(rateAvarge()));
rateBelowAvarageAct = new QAction(QIcon(":/images/rate-2.png"), tr("Below avarage"), this);
rateBelowAvarageAct->setShortcut(Qt::CTRL + Qt::Key_2);
connect(rateBelowAvarageAct, SIGNAL(triggered()), this, SLOT(rateBelowAverage()));
rateBadAct = new QAction(QIcon(":/images/rate-1.png"), tr("Bad"), this);
rateBadAct->setShortcut(Qt::CTRL + Qt::Key_1);
connect(rateBadAct, SIGNAL(triggered()), this, SLOT(rateBad()));
rateUnratedAct = new QAction(tr("Unrated"), this);
rateUnratedAct->setShortcut(Qt::CTRL + Qt::Key_0);
connect(rateUnratedAct, SIGNAL(triggered()), this, SLOT(rateUnrated()));
QMenu *ratingMenu = new QMenu(tr("Rating"), this);
ratingMenu->setIcon(QIcon(":/images/rating.png"));
ratingMenu->addAction(rateExcellenAct);
ratingMenu->addAction(rateGoodAct);
ratingMenu->addAction(rateAverageAct);
ratingMenu->addAction(rateBelowAvarageAct);
ratingMenu->addAction(rateBadAct);
ratingMenu->addAction(rateUnratedAct);
contextMnu.clear(); contextMnu.clear();
contextMnu.addAction(rm); contextMnu.addAction(openphotoAct);
contextMnu.addSeparator(); contextMnu.addSeparator();
contextMnu.addMenu( ratingMenu);
contextMnu.addSeparator();
contextMnu.addAction(removephotoAct);
contextMnu.exec( mevent->globalPos() ); contextMnu.exec( mevent->globalPos() );
} }

View File

@ -79,6 +79,13 @@ private:
/** Define the popup menus for the Context menu */ /** Define the popup menus for the Context menu */
QMenu* contextMnu; QMenu* contextMnu;
QAction *rateExcellenAct;
QAction *rateGoodAct;
QAction *rateAverageAct;
QAction *rateBelowAvarageAct;
QAction *rateBadAct;
QAction *rateUnratedAct;
QTreeWidget *exampletreeWidget; QTreeWidget *exampletreeWidget;
/** Qt Designer generated object */ /** Qt Designer generated object */

View File

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>PhotoShow</class> <class>PhotoShow</class>
<widget class="QWidget" name="PhotoShow"> <widget class="QWidget" name="PhotoShow">
@ -5,12 +6,12 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>591</width> <width>528</width>
<height>421</height> <height>421</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Photo Show</string>
</property> </property>
<layout class="QGridLayout"> <layout class="QGridLayout">
<item row="0" column="0"> <item row="0" column="0">
@ -160,6 +161,9 @@
<property name="text"> <property name="text">
<string>No Photo Selected</string> <string>No Photo Selected</string>
</property> </property>
<property name="scaledContents">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item> <item>
@ -177,24 +181,24 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item>
<widget class="QPushButton" name="startButton" >
<property name="text" >
<string>Start</string>
</property>
</widget>
</item>
<item> <item>
<widget class="QPushButton" name="backButton"> <widget class="QPushButton" name="backButton">
<property name="text"> <property name="text">
<string>Back</string> <string>Back</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="images.qrc" > <iconset>
<normaloff>:/images/back.png</normaloff>:/images/back.png</iconset> <normaloff>:/images/back.png</normaloff>:/images/back.png</iconset>
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QPushButton" name="startButton">
<property name="text">
<string>Start</string>
</property>
</widget>
</item>
<item> <item>
<widget class="QPushButton" name="playButton"> <widget class="QPushButton" name="playButton">
<property name="text"> <property name="text">
@ -215,7 +219,7 @@
<string>Forward</string> <string>Forward</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="images.qrc" > <iconset>
<normaloff>:/images/forward.png</normaloff>:/images/forward.png</iconset> <normaloff>:/images/forward.png</normaloff>:/images/forward.png</iconset>
</property> </property>
</widget> </widget>