Skip to content
This repository has been archived by the owner on Feb 20, 2023. It is now read-only.

Commit

Permalink
branding
Browse files Browse the repository at this point in the history
  • Loading branch information
tubedev2000 committed Jun 9, 2020
1 parent df007c4 commit c9311ad
Show file tree
Hide file tree
Showing 30 changed files with 534 additions and 114 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -439,5 +439,5 @@ endif()
add_subdirectory(src)

# Required to make wallet_merged build before the gui
add_dependencies(monero-wallet-gui wallet_merged)
add_dependencies(bittubecash-wallet-gui wallet_merged)

10 changes: 5 additions & 5 deletions LeftPanel.qml
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ Rectangle {
if (persistentSettings.fiatPriceEnabled && persistentSettings.fiatPriceToggle) {
return appWindow.fiatApiCurrencySymbol();
} else {
return "XMR"
return "TUBE"
}
}
color: MoneroComponents.Style.blackTheme ? "white" : "black"
Expand Down Expand Up @@ -496,7 +496,7 @@ Rectangle {
}

// ------------- Mining tab ---------------
MoneroComponents.MenuButton {
/*MoneroComponents.MenuButton {
id: miningButton
visible: !isAndroid && !isIOS && appWindow.walletMode >= 2
anchors.left: parent.left
Expand All @@ -516,7 +516,7 @@ Rectangle {
anchors.left: parent.left
anchors.right: parent.right
anchors.leftMargin: 20
}
}*/

// ------------- TxKey tab ---------------
MoneroComponents.MenuButton {
Expand All @@ -542,7 +542,7 @@ Rectangle {
}

// ------------- Shared RingDB tab ---------------
MoneroComponents.MenuButton {
/*MoneroComponents.MenuButton {
id: sharedringdbButton
visible: appWindow.walletMode >= 2
anchors.left: parent.left
Expand All @@ -562,7 +562,7 @@ Rectangle {
anchors.left: parent.left
anchors.right: parent.right
anchors.leftMargin: 20
}
}*/

// ------------- Sign/verify tab ---------------
MoneroComponents.MenuButton {
Expand Down
2 changes: 1 addition & 1 deletion monero-wallet-gui.pro → bittubecash-wallet-gui.pro
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,7 @@ linux:!android {
}

android{
deploy.commands += make install INSTALL_ROOT=$$DESTDIR && androiddeployqt --input android-libmonero-wallet-gui.so-deployment-settings.json --output $$DESTDIR --deployment bundled --android-platform android-21 --jdk /usr/lib/jvm/java-8-openjdk-amd64 -qmldir=$$PWD
deploy.commands += make install INSTALL_ROOT=$$DESTDIR && androiddeployqt --input android-libbittubecash-wallet-gui.so-deployment-settings.json --output $$DESTDIR --deployment bundled --android-platform android-21 --jdk /usr/lib/jvm/java-8-openjdk-amd64 -qmldir=$$PWD
}


Expand Down
4 changes: 2 additions & 2 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ if [ "$ANDROID" != true ] && ([ "$platform" == "linux32" ] || [ "$platform" == "
fi

if [ "$platform" == "darwin" ]; then
BIN_PATH=$BIN_PATH/monero-wallet-gui.app/Contents/MacOS/
BIN_PATH=$BIN_PATH/bittubecash-wallet-gui.app/Contents/MacOS/
elif [ "$platform" == "mingw64" ] || [ "$platform" == "mingw32" ]; then
MONEROD_EXEC=bittubed.exe
fi
Expand All @@ -111,7 +111,7 @@ if ! QMAKE=$(find_command qmake qmake-qt5); then
echo "Failed to find suitable qmake command."
exit 1
fi
$QMAKE ../monero-wallet-gui.pro "$CONFIG" || exit
$QMAKE ../bittubecash-wallet-gui.pro "$CONFIG" || exit
$MAKE || exit

# Copy monerod to bin folder
Expand Down
14 changes: 7 additions & 7 deletions components/Style.qml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ QtObject {
property string _b_defaultFontColor: "white"
property string _b_dimmedFontColor: "#BBBBBB"
property string _b_lightGreyFontColor: "#DFDFDF"
property string _b_errorColor: "#FA6800"
property string _b_errorColor: "#00ABFF"
property string _b_textSelectionColor: "#BBBBBB"
property string _b_textSelectedColor: "white"

Expand All @@ -97,8 +97,8 @@ QtObject {
property string _b_inputBorderColorInActive: Qt.rgba(255, 255, 255, 0.32)
property string _b_inputBorderColorInvalid: Qt.rgba(255, 0, 0, 0.40)

property string _b_buttonBackgroundColor: "#FA6800"
property string _b_buttonBackgroundColorHover: "#E65E00"
property string _b_buttonBackgroundColor: "#00ABFF"
property string _b_buttonBackgroundColorHover: "#00ABFF"
property string _b_buttonBackgroundColorDisabled: "#707070"
property string _b_buttonBackgroundColorDisabledHover: "#808080"
property string _b_buttonInlineBackgroundColor: "#707070"
Expand Down Expand Up @@ -141,7 +141,7 @@ QtObject {
property string _w_defaultFontColor: "black"
property string _w_dimmedFontColor: "#3f3f3f"
property string _w_lightGreyFontColor: "#515151"
property string _w_errorColor: "#FA6800"
property string _w_errorColor: "#00ABFF"
property string _w_textSelectionColor: "#BBBBBB"
property string _w_textSelectedColor: "black"

Expand All @@ -154,8 +154,8 @@ QtObject {
property string _w_inputBorderColorInActive: Qt.rgba(0, 0, 0, 0.16)
property string _w_inputBorderColorInvalid: Qt.rgba(255, 0, 0, 0.50)

property string _w_buttonBackgroundColor: "#FA6800"
property string _w_buttonBackgroundColorHover: "#E65E00"
property string _w_buttonBackgroundColor: "#00ABFF"
property string _w_buttonBackgroundColorHover: "#00ABFF"
property string _w_buttonBackgroundColorDisabled: "#bbbbbb"
property string _w_buttonBackgroundColorDisabledHover: "#D1D1D1"
property string _w_buttonInlineBackgroundColor: "#bbbbbb"
Expand All @@ -182,7 +182,7 @@ QtObject {
property string _w_menuButtonGradientStop: "#10FFFFFF"
property string _w_menuButtonTextColor: "#787878"
property string _w_menuButtonImageRightSource: "qrc:///images/right.svg"
property string _w_menuButtonImageRightColorActive: "#FA6800"
property string _w_menuButtonImageRightColorActive: "#00ABFF"
property string _w_menuButtonImageRightColor: "#808080"
property string _w_menuButtonImageDotArrowSource: "qrc:///images/arrow-right-medium-white.png"
property string _w_inlineButtonTextColor: "black"
Expand Down
Loading

0 comments on commit c9311ad

Please sign in to comment.