diff --git a/res/ui/mainwindow.ui b/res/ui/mainwindow.ui index 86165ad429ff846a126108fc7e36b3ba97221ef3..112af4dc09d2594279c008c8be3cea7463336230 100644 --- a/res/ui/mainwindow.ui +++ b/res/ui/mainwindow.ui @@ -66,15 +66,15 @@ </property> <addaction name="actionAbout"/> </widget> - <widget class="QMenu" name="menuDuniter"> + <widget class="QMenu" name="menu_duniter"> <property name="title"> - <string>Dunit&er</string> + <string>&Duniter</string> </property> <addaction name="actionManage_local_node"/> </widget> <addaction name="menu_file"/> <addaction name="menu_account"/> - <addaction name="menuDuniter"/> + <addaction name="menu_duniter"/> <addaction name="menu_help"/> </widget> <widget class="QStatusBar" name="statusbar"/> @@ -185,7 +185,7 @@ </action> <action name="actionManage_local_node"> <property name="text"> - <string>Manage local node</string> + <string>&Manage local node</string> </property> </action> </widget> diff --git a/src/sakia/tests/functional/main_window/test_main_window_menus.py b/src/sakia/tests/functional/main_window/test_main_window_menus.py index 1b79265df35394dbc8c9c864eba57efbe7ff553b..6b4ad861ba6787e769fc4dcfdfa164c65ddb4165 100644 --- a/src/sakia/tests/functional/main_window/test_main_window_menus.py +++ b/src/sakia/tests/functional/main_window/test_main_window_menus.py @@ -28,10 +28,11 @@ class MainWindowMenusTest(unittest.TestCase, QuamashTest): for child in children: if isinstance(child, QMenu): menus.append(child) - self.assertEqual(len(menus), 3) + self.assertEqual(len(menus), 4) self.assertEqual(menus[0].objectName(), 'menu_file') self.assertEqual(menus[1].objectName(), 'menu_account') self.assertEqual(menus[2].objectName(), 'menu_help') + self.assertEqual(menus[3].objectName(), 'menu_duniter') def test_menu_account(self): actions = self.main_window.ui.menu_account.actions() diff --git a/src/sakia/tests/unit/gui/test_main_window.py b/src/sakia/tests/unit/gui/test_main_window.py index 12d42269c34e31bae69bdbda4b271d21208168d7..f32d1e9067276e96fa1ce037aa1a7402cfc1f770 100644 --- a/src/sakia/tests/unit/gui/test_main_window.py +++ b/src/sakia/tests/unit/gui/test_main_window.py @@ -34,6 +34,7 @@ class TestMainWindow(unittest.TestCase, QuamashTest): self.homescreen = MagicMock(autospec='sakia.gui.homescreen.Homescreen') self.community_view = MagicMock(autospec='sakia.gui.community_view.CommunityView') self.password_asker = MagicMock(autospec='sakia.gui.password_asker.PasswordAsker') + self.node_manager = MagicMock(autospec='sakia.gui.node_manager.NodeManager') def tearDown(self): self.tearDownQuamash() @@ -47,7 +48,9 @@ class TestMainWindow(unittest.TestCase, QuamashTest): label_status = Mock() label_time = Mock() combo_referentials = Mock() - mainwindow = MainWindow(self.app, self.account_joe, self.homescreen, self.community_view, widget, ui, label_icon, + mainwindow = MainWindow(self.app, self.account_joe, + self.homescreen, self.community_view, self.node_manager, + widget, ui, label_icon, label_status, label_time, combo_referentials, self.password_asker) mainwindow.refresh = Mock() mainwindow.action_change_account("doe") @@ -70,7 +73,8 @@ class TestMainWindow(unittest.TestCase, QuamashTest): label_time = Mock() combo_referentials = Mock() type(self.app).current_account = PropertyMock(return_value=None) - mainwindow = MainWindow(self.app, None, self.homescreen, self.community_view, widget, ui, label_icon, + mainwindow = MainWindow(self.app, None, self.homescreen, self.community_view, self.node_manager, + widget, ui, label_icon, label_status, label_time, combo_referentials, self.password_asker) mainwindow.refresh = Mock() mainwindow.action_change_account("doe")