Merge pull request #86 from vertoe/devel-0.9

Remove all bitcoin references in the UI.

contrib/debian/examples/darkcoin.conf

@@ -3,7 +3,7 @@
 
 # Network-related settings:
 
-# Run on the test network instead of the real bitcoin network.
+# Run on the test network instead of the real darkcoin network.
 #testnet=1
 
 # Connect via a socks4 proxy
@@ -22,9 +22,9 @@
 #maxconnections=
 
 
-# JSON-RPC options (for controlling a running Bitcoin/bitcoind process)
+# JSON-RPC options (for controlling a running Darkcoin/darkcoind process)
 
-# server=1 tells Bitcoin to accept JSON-RPC commands.
+# server=1 tells Darkcoin to accept JSON-RPC commands.
 #server=1
 
 # You must set rpcuser and rpcpassword to secure the JSON-RPC api
@@ -40,12 +40,12 @@
 # Listen for RPC connections on this TCP port:
 rpcport=9998
 
-# You can use Bitcoin or bitcoind to send commands to Bitcoin/bitcoind
+# You can use Darkcoin or darkcoind to send commands to Darkcoin/darkcoind
 # running on another host using this option:
 rpcconnect=127.0.0.1
 
 # Use Secure Sockets Layer (also known as TLS or HTTPS) to communicate
-# with Bitcoin -server or bitcoind
+# with Darkcoin -server or darkcoind
 #rpcssl=1
 
 # OpenSSL settings used when rpcssl=1
@@ -56,17 +56,17 @@ rpcsslprivatekeyfile=server.pem
 
 # Miscellaneous options
 
-# Set gen=1 to attempt to generate bitcoins
+# Set gen=1 to attempt to generate darkcoins
 gen=0
 
-# Use SSE instructions to try to generate bitcoins faster.
+# Use SSE instructions to try to generate darkcoins faster.
 #4way=1
 
 # Pre-generate this many public/private key pairs, so wallet backups will be valid for
 # both prior transactions and several dozen future transactions.
 keypool=100
 
-# Pay an optional transaction fee every time you send bitcoins.  Transactions with fees
+# Pay an optional transaction fee every time you send darkcoins.  Transactions with fees
 # are more likely than free transactions to be included in generated blocks, so may
 # be validated sooner.
 paytxfee=0.00
@@ -77,7 +77,7 @@ paytxfee=0.00
 
 # User interface options
 
-# Start Bitcoin minimized
+# Start Darkcoin minimized
 #min=1
 
 # Minimize to the system tray

src/qt/bitcoingui.cpp

@@ -180,7 +180,7 @@ BitcoinGUI::BitcoinGUI(bool fIsTestnet, QWidget *parent) :
     QString curStyle = QApplication::style()->metaObject()->className();
     if(curStyle == "QWindowsStyle" || curStyle == "QWindowsXPStyle")
     {
-        progressBar->setStyleSheet("QProgressBar { background-color: #e8e8e8; border: 1px solid grey; border-radius: 7px; padding: 1px; text-align: center; } QProgressBar::chunk { background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 0, stop: 0 #FF8000, stop: 1 orange); border-radius: 7px; margin: 0px; }");
+        progressBar->setStyleSheet("QProgressBar { background-color: #F8F8F8; border: 1px solid grey; border-radius: 7px; padding: 1px; text-align: center; } QProgressBar::chunk { background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 0, stop: 0 #00CCFF, stop: 1 #33CCFF); border-radius: 7px; margin: 0px; }");
     }
 
     statusBar()->addWidget(progressBarLabel);

src/qt/forms/aboutdialog.ui

@@ -91,7 +91,7 @@
         <cursorShape>IBeamCursor</cursorShape>
        </property>
        <property name="text">
-        <string notr="true">Copyright &amp;copy; 2009-YYYY The Bitcoin Core developers
+        <string notr="true">Copyright &amp;copy; 2009-2014 The Bitcoin Core developers
 Copyright &amp;copy; 2014-YYYY The Darkcoin Core developers</string>
        </property>
        <property name="textFormat">

src/qt/forms/helpmessagedialog.ui

@@ -16,7 +16,7 @@
    </font>
   </property>
   <property name="windowTitle">
-   <string>Bitcoin Core - Command-line options</string>
+   <string>Darkcoin Core - Command-line options</string>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout_2">
    <item>

src/qt/forms/intro.ui

@@ -20,7 +20,7 @@
       <string notr="true">QLabel { font-style:italic; }</string>
      </property>
      <property name="text">
-      <string>Welcome to Bitcoin Core.</string>
+      <string>Welcome to Darkcoin Core.</string>
      </property>
      <property name="wordWrap">
       <bool>true</bool>
@@ -46,7 +46,7 @@
    <item>
     <widget class="QLabel" name="label_4">
      <property name="text">
-      <string>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</string>
+      <string>As this is the first time the program is launched, you can choose where Darkcoin Core will store its data.</string>
      </property>
      <property name="wordWrap">
       <bool>true</bool>
@@ -56,7 +56,7 @@
    <item>
     <widget class="QLabel" name="sizeWarningLabel">
      <property name="text">
-      <string>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</string>
+      <string>Darkcoin Core will download and store a copy of the Darkcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</string>
      </property>
      <property name="wordWrap">
       <bool>true</bool>

src/qt/forms/optionsdialog.ui

@@ -30,10 +30,10 @@
        <item>
         <widget class="QCheckBox" name="bitcoinAtStartup">
          <property name="toolTip">
-          <string>Automatically start Bitcoin after logging in to the system.</string>
+          <string>Automatically start Darkcoin after logging in to the system.</string>
          </property>
          <property name="text">
-          <string>&amp;Start Bitcoin on system login</string>
+          <string>&amp;Start Darkcoin on system login</string>
          </property>
         </widget>
        </item>
@@ -308,7 +308,7 @@
        <item>
         <widget class="QCheckBox" name="mapPortUpnp">
          <property name="toolTip">
-          <string>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</string>
+          <string>Automatically open the Darkcoin client port on the router. This only works when your router supports UPnP and it is enabled.</string>
          </property>
          <property name="text">
           <string>Map port using &amp;UPnP</string>
@@ -318,7 +318,7 @@
        <item>
         <widget class="QCheckBox" name="connectSocks">
          <property name="toolTip">
-          <string>Connect to the Bitcoin network through a SOCKS proxy.</string>
+          <string>Connect to the Darkcoin network through a SOCKS proxy.</string>
          </property>
          <property name="text">
           <string>&amp;Connect through SOCKS proxy (default proxy):</string>
@@ -504,7 +504,7 @@
          <item>
           <widget class="QValueComboBox" name="lang">
            <property name="toolTip">
-            <string>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</string>
+            <string>The user interface language can be set here. This setting will take effect after restarting Darkcoin.</string>
            </property>
           </widget>
          </item>
@@ -537,7 +537,7 @@
        <item>
         <widget class="QCheckBox" name="displayAddresses">
          <property name="toolTip">
-          <string>Whether to show Bitcoin addresses in the transaction list or not.</string>
+          <string>Whether to show Darkcoin addresses in the transaction list or not.</string>
          </property>
          <property name="text">
           <string>&amp;Display addresses in transaction list</string>

src/qt/forms/overviewpage.ui

@@ -61,7 +61,7 @@
             <item>
              <widget class="QLabel" name="labelWalletStatus">
               <property name="toolTip">
-               <string>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</string>
+               <string>The displayed information may be out of date. Your wallet automatically synchronizes with the Darkcoin network after a connection is established, but this process has not completed yet.</string>
               </property>
               <property name="styleSheet">
                <string notr="true">QLabel { color: red; }</string>
@@ -907,7 +907,7 @@
             <item>
              <widget class="QLabel" name="labelTransactionsStatus">
               <property name="toolTip">
-               <string>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</string>
+               <string>The displayed information may be out of date. Your wallet automatically synchronizes with the Darkcoin network after a connection is established, but this process has not completed yet.</string>
               </property>
               <property name="styleSheet">
                <string notr="true">QLabel { color: red; }</string>

src/qt/forms/receivecoinsdialog.ui

@@ -48,7 +48,7 @@
      <item row="6" column="0">
       <widget class="QLabel" name="label_3">
        <property name="toolTip">
-        <string>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</string>
+        <string>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Darkcoin network.</string>
        </property>
        <property name="text">
         <string>&amp;Message:</string>
@@ -71,7 +71,7 @@
      <item row="6" column="2">
       <widget class="QLineEdit" name="reqMessage">
        <property name="toolTip">
-        <string>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</string>
+        <string>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Darkcoin network.</string>
        </property>
       </widget>
      </item>

src/qt/forms/rpcconsole.ui

@@ -305,7 +305,7 @@
        <item row="14" column="0">
         <widget class="QPushButton" name="openDebugLogfileButton">
          <property name="toolTip">
-          <string>Open the Bitcoin debug log file from the current data directory. This can take a few seconds for large log files.</string>
+          <string>Open the Darkcoin debug log file from the current data directory. This can take a few seconds for large log files.</string>
          </property>
          <property name="text">
           <string>&amp;Open</string>

src/version.cpp

@@ -10,7 +10,7 @@
 // Name of client reported in the 'version' message. Report the same name
 // for both darkcoind and darkcoin-qt, to make it harder for attackers to
 // target servers or GUI users specifically.
-const std::string CLIENT_NAME("Darkcoin Core");
+const std::string CLIENT_NAME("Core");
 
 // Client version number
 #define CLIENT_VERSION_SUFFIX   "-beta"