mastercoin-wallet 0.0.7 → 0.0.8

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/lib/mastercoin-wallet/gui/main_window.rb

@@ -28,7 +28,7 @@ module MastercoinWallet
       @ui = Ui_MainWindow.new
       @ui.setupUi(self)
 
-      setWindowTitle(tr("Mastercoin wallet - v0.0.7"))
+      setWindowTitle(tr("Mastercoin wallet - v0.0.8"))
 
       @rows = []
 

data/lib/mastercoin-wallet/gui/purchase_offer_window.rb

@@ -26,8 +26,8 @@ module MastercoinWallet
       @fee_input.validator = Qt::DoubleValidator.new(0.00000001, 10000,8, @fee_input)
 
       @currency_select = findChild(Qt::ComboBox, "currency_box")
-      # Dont allow real coins for now
-      #      @currency_select.addItem(tr("Mastercoin"))
+
+      @currency_select.addItem(tr("Mastercoin"))
       @currency_select.addItem(tr("Test Mastercoin"))
 
       @submit.enabled = true
@@ -41,6 +41,14 @@ module MastercoinWallet
       @password = @password_input.text()
       @fee = @fee_input.text()
 
+      if @currency_select.currentText() == "Mastercoin"
+        currency_id = 1
+      elsif @currency_select.currentText() == "Test Mastercoin"
+        currency_id = 2
+      else
+        raise "How did you get here? ^_^"
+      end
+
       unless Bitcoin::valid_address?(@receiving_address)
         Qt::MessageBox.critical(self, tr("Invalid address"),
                                 tr("Please fill in a valid Bitcoin/Mastercoin address"))

data/lib/mastercoin-wallet/gui/selling_offer_window.rb

@@ -28,8 +28,7 @@ module MastercoinWallet
 
 
       @currency_select = findChild(Qt::ComboBox, "currency_box")
-      # Dont allow real coins for now
-      #      @currency_select.addItem(tr("Mastercoin"))
+      #@currency_select.addItem(tr("Mastercoin"))
       @currency_select.addItem(tr("Test Mastercoin"))
 
       @submit.enabled = true
@@ -44,9 +43,17 @@ module MastercoinWallet
       @time = @time_input.text()
       @password = @password_input.text()
 
+      if @currency_select.currentText() == "Mastercoin"
+        currency_id = 1
+      elsif @currency_select.currentText() == "Test Mastercoin"
+        currency_id = 2
+      else
+        raise "How did you get here? ^_^"
+      end
+
       unless @time.empty? || @fee_amount.empty? || @btc_amount.empty? || @amount.empty? || @password.empty?
 
-        data_keys = Mastercoin::SellingOffer.new(currency_id: 2, amount: (@amount.to_f * 1e8).to_i, bitcoin_amount: (@btc_amount.to_f * 1e8).to_i, time_limit: @time.to_i, transaction_fee: (@fee_amount.to_f * 1e8).to_i).encode_to_compressed_public_key(MastercoinWallet.config.address)
+        data_keys = Mastercoin::SellingOffer.new(currency_id: currency_id, amount: (@amount.to_f * 1e8).to_i, bitcoin_amount: (@btc_amount.to_f * 1e8).to_i, time_limit: @time.to_i, transaction_fee: (@fee_amount.to_f * 1e8).to_i).encode_to_compressed_public_key(MastercoinWallet.config.address)
 
         create_transaction_with_keys(data_keys)
         close()

data/lib/mastercoin-wallet/gui/simple_send_window.ui

@@ -35,7 +35,7 @@
       <item row="0" column="0">
        <widget class="QLabel" name="label_2">
         <property name="text">
-         <string>Masteroin address</string>
+         <string>Mastercoin address</string>
         </property>
        </widget>
       </item>
@@ -91,9 +91,9 @@
    <property name="geometry">
     <rect>
      <x>20</x>
-     <y>10</y>
+     <y>5</y>
      <width>151</width>
-     <height>16</height>
+     <height>21</height>
     </rect>
    </property>
    <property name="text">

data/lib/mastercoin-wallet/gui/ui_main.rb

@@ -1,7 +1,7 @@
 =begin
 ** Form generated from reading ui file 'main_window.ui'
 **
-** Created: Thu Nov 14 13:28:58 2013
+** Created: Fri Nov 15 08:31:52 2013
 **      by: Qt User Interface Compiler version 4.8.4
 **
 ** WARNING! All changes made in this file will be lost when recompiling ui file!
@@ -117,7 +117,7 @@ class Ui_MainWindow
     @mscAddressLabel.sizePolicy = @sizePolicy2
     @font1 = Qt::Font.new
     @font1.family = "Verdana"
-    @font1.pointSize = 24
+    @font1.pointSize = 21
     @mscAddressLabel.font = @font1
     @mscAddressLabel.textInteractionFlags = Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse
 

data/lib/mastercoin-wallet/gui/ui_simple_send.rb

@@ -1,7 +1,7 @@
 =begin
 ** Form generated from reading ui file 'simple_send_window.ui'
 **
-** Created: Sat Nov 2 14:56:54 2013
+** Created: Fri Nov 15 08:31:53 2013
 **      by: Qt User Interface Compiler version 4.8.4
 **
 ** WARNING! All changes made in this file will be lost when recompiling ui file!
@@ -82,7 +82,7 @@ class Ui_SimpleSend
 
     @label = Qt::Label.new(simpleSend)
     @label.objectName = "label"
-    @label.geometry = Qt::Rect.new(20, 10, 151, 16)
+    @label.geometry = Qt::Rect.new(20, 5, 151, 21)
     @submit_button = Qt::PushButton.new(simpleSend)
     @submit_button.objectName = "submit_button"
     @submit_button.enabled = false
@@ -105,7 +105,7 @@ class Ui_SimpleSend
     def retranslateUi(simpleSend)
     simpleSend.windowTitle = Qt::Application.translate("SimpleSend", "New Simple Send", nil, Qt::Application::UnicodeUTF8)
     @amount_input.placeholderText = ''
-    @label_2.text = Qt::Application.translate("SimpleSend", "Masteroin address", nil, Qt::Application::UnicodeUTF8)
+    @label_2.text = Qt::Application.translate("SimpleSend", "Mastercoin address", nil, Qt::Application::UnicodeUTF8)
     @label_3.text = Qt::Application.translate("SimpleSend", "Amount", nil, Qt::Application::UnicodeUTF8)
     @label_4.text = Qt::Application.translate("SimpleSend", "Currency", nil, Qt::Application::UnicodeUTF8)
     @address_input.placeholderText = ''

data/mastercoin-wallet.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "mastercoin-wallet"
-  s.version = "0.0.7"
+  s.version = "0.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Maran"]
-  s.date = "2013-11-14"
+  s.date = "2013-11-17"
   s.description = "Mastercoin wallet using QT bindings to create a useful gui wallet"
   s.email = "maran.hidskes@gmail.com"
   s.executables = ["console", "mastercoin-wallet"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mastercoin-wallet
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-14 00:00:00.000000000 Z
+date: 2013-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mastercoin-ruby
@@ -241,7 +241,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -877991234193888793
+      hash: -1555233637447261091
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: