Skip to content

Commit

Permalink
Window icon (#21)
Browse files Browse the repository at this point in the history
* Add minor visual improvements

* Makefile fix

* Even better Makefile

* Change search hint
  • Loading branch information
lcmaqueda authored and cortex committed Nov 2, 2016
1 parent ce000de commit 5cb665e
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 12 deletions.
14 changes: 10 additions & 4 deletions Makefile
@@ -1,20 +1,26 @@
default: build

OS := $(shell uname)
XDG_APPLICATION_PATH = ~/.local/share/applications
XDG_ICON_PATH = ~/.local/share/icons/hicolor/scalable/apps

build:
git submodule init
git submodule update
go generate
go build

install: build
go install
ifeq ($(OS),Linux)
cp gopass.desktop ~/.local/share/applications
cp assets/logo.svg ~/.local/share/icons/hicolor/scalable/apps/gopass.svg
mkdir -p $(XDG_APPLICATION_PATH)
cp gopass.desktop $(XDG_APPLICATION_PATH)
mkdir -p $(XDG_ICON_PATH)
cp assets/logo.svg $(XDG_ICON_PATH)/gopass.svg
endif

setup:
git submodule init
git submodule update

clean:
rm qrc.go
go clean
17 changes: 9 additions & 8 deletions assets/main.qml
Expand Up @@ -73,9 +73,12 @@ ApplicationWindow {

onTextChanged: ui.query(text)
onAccepted: passwords.copyToClipboard(hitList.currentIndex)
textColor: "white"

placeholderText: "Search your passwords..."

style: TextFieldStyle {
textColor: "white"
placeholderTextColor: "#444"
background: Rectangle {
radius: 5
border.color: "#666"
Expand Down Expand Up @@ -131,8 +134,6 @@ ApplicationWindow {
width: 300;
Layout.fillHeight: true
color: "#444"
border.color: "#333"
border.width: 2
radius: 10

ColumnLayout {
Expand Down Expand Up @@ -216,7 +217,7 @@ ApplicationWindow {
anchors.horizontalCenter: parent.horizontalCenter
horizontalAlignment: Text.AlignHCenter
font.pixelSize: 18
text: ui.password.name
text: ui.password.name
color: "#eee"
}
Rectangle {
Expand Down Expand Up @@ -249,16 +250,16 @@ ApplicationWindow {
height: 100
Layout.fillWidth: true
anchors.horizontalCenter: parent.horizontalCenter
RoundButton {
label: "COPY"
label: "COPY"
onClicked: passwords.copyToClipboard(hitList.currentIndex)
}
RoundButton {
label: "SHOW"
label: "SHOW"
onClicked: ui.toggleShowMetadata()
}
}
*/
ScrollView {
Expand Down

0 comments on commit 5cb665e

Please sign in to comment.