From: Maran <maran.hidskes@gmail.com>
Date: Sun, 12 Aug 2012 20:58:48 +0000 (+0200)
Subject: Merged history from master
X-Git-Url: https://git.novaco.in/?a=commitdiff_plain;h=0363f21c3278af7289544e0cf48bb672b4f41026;p=electrum-nvc.git

Merged history from master
---

0363f21c3278af7289544e0cf48bb672b4f41026
diff --cc lib/gui_lite.py
index b8dda84,67ccdc8..c7ceacd
--- a/lib/gui_lite.py
+++ b/lib/gui_lite.py
@@@ -174,16 -175,38 +175,33 @@@ class MiniWindow(QDialog)
          main_layout.addWidget(self.amount_input, 2, 0)
          main_layout.addWidget(self.send_button, 2, 1)
  
+         self.history_list = history_widget.HistoryWidget()
+         self.history_list.setObjectName("history")
+         self.history_list.hide()
+         self.history_list.setAlternatingRowColors(True)
+         main_layout.addWidget(self.history_list, 3, 0, 1, -1)
+ 
          menubar = QMenuBar()
          electrum_menu = menubar.addMenu(_("&Bitcoin"))
-         #electrum_menu.addMenu(_("&Servers"))
-         #electrum_menu.addSeparator()
 -        electrum_menu.addMenu(_("&Servers"))
 -        electrum_menu.addSeparator()
          electrum_menu.addAction(_("&Quit"))
  
          view_menu = menubar.addMenu(_("&View"))
          expert_gui = view_menu.addAction(_("&Pro Mode"))
          self.connect(expert_gui, SIGNAL("triggered()"), expand_callback)
 -        view_menu.addMenu(_("&Themes"))
 -        view_menu.addSeparator()
 +
+         show_history = view_menu.addAction(_("Show History"))
+         show_history.setCheckable(True)
+         self.connect(show_history, SIGNAL("toggled(bool)"), self.show_history)
+ 
 -        settings_menu = menubar.addMenu(_("&Settings"))
 -        settings_menu.addAction(_("&Configure Electrum"))
 -        
+         help_menu = menubar.addMenu(_("&Help"))
+         the_website = help_menu.addAction(_("&Website"))
+         self.connect(the_website, SIGNAL("triggered()"), self.the_website)
+         help_menu.addSeparator()
+         report_bug = help_menu.addAction(_("&Report Bug"))
+         self.connect(report_bug, SIGNAL("triggered()"), self.show_report_bug)
+         show_about = help_menu.addAction(_("&About"))
+         self.connect(show_about, SIGNAL("triggered()"), self.show_about)
++
          main_layout.setMenuBar(menubar)
  
          quit_shortcut = QShortcut(QKeySequence("Ctrl+Q"), self)