From 4f3fcfb1a3d28db6dc5b317555f543ebac1ebb89 Mon Sep 17 00:00:00 2001 From: Inso <insomniak.fr@gmail.com> Date: Thu, 24 Sep 2015 21:53:10 +0200 Subject: [PATCH] New button to show diverse actions --- res/icons/AUTHORS | 3 ++- res/icons/icons.qrc | 1 + res/ui/community_view.ui | 26 ++++++++++++++++++++++++++ src/cutecoin/gui/community_view.py | 29 +++++++++++++++++------------ 4 files changed, 46 insertions(+), 13 deletions(-) diff --git a/res/icons/AUTHORS b/res/icons/AUTHORS index 701840e2..addcf88f 100644 --- a/res/icons/AUTHORS +++ b/res/icons/AUTHORS @@ -23,4 +23,5 @@ noun_178785_cc.svg : by Jevgeni Striganov noun_41979_cc.svg : by by hunotika noun_155533_cc.svg : by anbileru adaleru noun_155520_cc.svg : by anbileru adaleru -noun_155540_cc.svg : by anbileru adaleru \ No newline at end of file +noun_155540_cc.svg : by anbileru adaleru +noun_100552_cc.svg : by Rui \ No newline at end of file diff --git a/res/icons/icons.qrc b/res/icons/icons.qrc index 8fe92ad9..124d65e8 100644 --- a/res/icons/icons.qrc +++ b/res/icons/icons.qrc @@ -1,5 +1,6 @@ <RCC> <qresource prefix="icons"> + <file alias="menu_icon">noun_100552_cc.svg</file> <file alias="leave_icon">noun_155520_cc.svg</file> <file alias="new_membership">noun_155540_cc.svg</file> <file alias="payment_icon">noun_178785_cc.svg</file> diff --git a/res/ui/community_view.ui b/res/ui/community_view.ui index 45b86c53..213060dc 100644 --- a/res/ui/community_view.ui +++ b/res/ui/community_view.ui @@ -104,6 +104,32 @@ </property> </widget> </item> + <item> + <widget class="QToolButton" name="toolbutton_menu"> + <property name="text"> + <string/> + </property> + <property name="icon"> + <iconset resource="../icons/icons.qrc"> + <normaloff>:/icons/menu_icon</normaloff>:/icons/menu_icon</iconset> + </property> + <property name="iconSize"> + <size> + <width>32</width> + <height>32</height> + </size> + </property> + <property name="popupMode"> + <enum>QToolButton::InstantPopup</enum> + </property> + <property name="autoRaise"> + <bool>false</bool> + </property> + <property name="arrowType"> + <enum>Qt::NoArrow</enum> + </property> + </widget> + </item> </layout> </widget> </item> diff --git a/src/cutecoin/gui/community_view.py b/src/cutecoin/gui/community_view.py index 779c1361..52aeb799 100644 --- a/src/cutecoin/gui/community_view.py +++ b/src/cutecoin/gui/community_view.py @@ -6,7 +6,7 @@ Created on 2 févr. 2014 import time import logging -from PyQt5.QtWidgets import QWidget, QMessageBox, QDialog, QPushButton, QTabBar +from PyQt5.QtWidgets import QWidget, QMessageBox, QDialog, QPushButton, QTabBar, QAction from PyQt5.QtCore import pyqtSlot, QDateTime, QLocale, QEvent from PyQt5.QtGui import QIcon @@ -58,8 +58,6 @@ class CommunityWidget(QWidget, Ui_CommunityWidget): self.tab_informations = InformationsTabWidget(self.app) - self.tab_menu = QWidget() - self.tab_network = NetworkTabWidget(self.app) self.tab_identities.view_in_wot.connect(self.tab_wot.draw_graph) self.tab_identities.view_in_wot.connect(lambda: self.tabs.setCurrentWidget(self.tab_wot)) @@ -84,16 +82,23 @@ class CommunityWidget(QWidget, Ui_CommunityWidget): QIcon(":/icons/network_icon"), self.tr("Network")) - self.tabs.addTab(self.tab_informations, - QIcon(":/icons/informations_icon"), - self.tr("Informations")) - style = self.app.qapp.style() - icon = style.standardIcon(style.SP_DockWidgetCloseButton) - close_button = QPushButton(icon, '') - close_button.clicked.connect(lambda: self.tabs.removeTab(self.tabs.indexOf(self.tab_informations))) - close_button.setStyleSheet('border-style: inset;') - self.tabs.tabBar().setTabButton(4, QTabBar.RightSide, close_button) + action_showinfo = QAction(self.tr("Show informations"), self.toolbutton_menu) + + def show_info(): + if self.tabs.indexOf(self.tab_informations) == -1: + self.tabs.addTab(self.tab_informations, + QIcon(":/icons/informations_icon"), + self.tr("Informations")) + style = self.app.qapp.style() + icon = style.standardIcon(style.SP_DockWidgetCloseButton) + close_button = QPushButton(icon, '') + close_button.clicked.connect(lambda: self.tabs.removeTab(self.tabs.indexOf(self.tab_informations))) + close_button.setStyleSheet('border-style: inset;') + self.tabs.tabBar().setTabButton(4, QTabBar.RightSide, close_button) + + action_showinfo.triggered.connect(show_info) + self.toolbutton_menu.addAction(action_showinfo) self.button_membership.clicked.connect(self.send_membership_demand) def cancel_once_tasks(self): -- GitLab