Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: copy to clipboard option for address and pubkey #583

Merged
merged 3 commits into from
Jul 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions cmd/gtk/assets/css/style.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
.inline_button {
padding: 2px;
margin-right: 3px;
}

.copyable_entry {
padding-right: 36px;
}
16 changes: 4 additions & 12 deletions cmd/gtk/assets/ui/dialog_address_details.ui
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,9 @@
</packing>
</child>
<child>
<object class="GtkEntry" id="id_entry_address">
<object class="GtkOverlay" id="id_overlay_address">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="hexpand">True</property>
<property name="editable">False</property>
<property name="width-chars">32</property>
<property name="caps-lock-warning">False</property>
<property name="can-focus">False</property>
</object>
<packing>
<property name="expand">False</property>
Expand All @@ -95,13 +91,9 @@
</packing>
</child>
<child>
<object class="GtkEntry" id="id_entry_public_key">
<object class="GtkOverlay" id="id_overlay_public_key">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="hexpand">True</property>
<property name="editable">False</property>
<property name="width-chars">32</property>
<property name="caps-lock-warning">False</property>
<property name="can-focus">False</property>
</object>
<packing>
<property name="expand">False</property>
Expand Down
4 changes: 2 additions & 2 deletions cmd/gtk/dialog_addresss_details.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ func showAddressDetails(wallet *wallet.Wallet, addr string) {
}

dlg := getDialogObj(builder, "id_dialog_address_details")
addressEntry := getEntryObj(builder, "id_entry_address")
pubKeyEntry := getEntryObj(builder, "id_entry_public_key")
addressEntry := buildExtendedEntry(builder, "id_overlay_address")
pubKeyEntry := buildExtendedEntry(builder, "id_overlay_public_key")
pathEntry := getEntryObj(builder, "id_entry_path")

addressEntry.SetText(info.Address)
Expand Down
16 changes: 16 additions & 0 deletions cmd/gtk/main_window.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,17 @@ package main
import (
_ "embed"

"github.com/gotk3/gotk3/gdk"
"github.com/gotk3/gotk3/gtk"
"github.com/pactus-project/pactus/crypto"
)

//go:embed assets/ui/main_window.ui
var uiMainWindow []byte

//go:embed assets/css/style.css
var cssCustom string

type mainWindow struct {
*gtk.ApplicationWindow

Expand Down Expand Up @@ -63,6 +67,18 @@ func buildMainWindow(nodeModel *nodeModel, walletModel *walletModel) *mainWindow
}
builder.ConnectSignals(signals)

// apply custom css
provider, err := gtk.CssProviderNew()
fatalErrorCheck(err)

err = provider.LoadFromData(cssCustom)
fatalErrorCheck(err)

screen, err := gdk.ScreenGetDefault()
fatalErrorCheck(err)

gtk.AddProviderForScreen(screen, provider, gtk.STYLE_PROVIDER_PRIORITY_APPLICATION)

return mw
}

Expand Down
68 changes: 60 additions & 8 deletions cmd/gtk/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"os/exec"
"runtime"

"github.com/gotk3/gotk3/gdk"
"github.com/gotk3/gotk3/glib"
"github.com/gotk3/gotk3/gtk"
"github.com/pactus-project/pactus/types/tx"
Expand All @@ -18,30 +19,30 @@ import (
)

func showQuestionDialog(parent gtk.IWindow, msg string) bool {
dlg := gtk.MessageDialogNewWithMarkup(parent, gtk.DIALOG_MODAL, gtk.MESSAGE_QUESTION, gtk.BUTTONS_YES_NO, "")
dlg.SetMarkup(msg)
dlg := gtk.MessageDialogNew(parent,
gtk.DIALOG_MODAL, gtk.MESSAGE_QUESTION, gtk.BUTTONS_YES_NO, msg)
res := dlg.Run()
dlg.Destroy()
return res == gtk.RESPONSE_YES
}

func showInfoDialog(parent gtk.IWindow, msg string) {
dlg := gtk.MessageDialogNewWithMarkup(parent, gtk.DIALOG_MODAL, gtk.MESSAGE_INFO, gtk.BUTTONS_OK, "")
dlg.SetMarkup(msg)
dlg := gtk.MessageDialogNew(parent,
gtk.DIALOG_MODAL, gtk.MESSAGE_INFO, gtk.BUTTONS_OK, msg)
dlg.Run()
dlg.Destroy()
}

func showWarningDialog(parent gtk.IWindow, msg string) {
dlg := gtk.MessageDialogNewWithMarkup(parent, gtk.DIALOG_MODAL, gtk.MESSAGE_WARNING, gtk.BUTTONS_OK, "")
dlg.SetMarkup(msg)
dlg := gtk.MessageDialogNew(parent,
gtk.DIALOG_MODAL, gtk.MESSAGE_WARNING, gtk.BUTTONS_OK, msg)
dlg.Run()
dlg.Destroy()
}

func showErrorDialog(parent gtk.IWindow, msg string) {
dlg := gtk.MessageDialogNewWithMarkup(parent, gtk.DIALOG_MODAL, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, "")
dlg.SetMarkup(msg)
dlg := gtk.MessageDialogNew(parent,
gtk.DIALOG_MODAL, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, msg)
dlg.Run()
dlg.Destroy()
}
Expand Down Expand Up @@ -86,6 +87,10 @@ func getEntryObj(builder *gtk.Builder, name string) *gtk.Entry {
return getObj(builder, name).(*gtk.Entry)
}

func getOverlayObj(builder *gtk.Builder, name string) *gtk.Overlay {
return getObj(builder, name).(*gtk.Overlay)
}

func getTreeViewObj(builder *gtk.Builder, name string) *gtk.TreeView {
return getObj(builder, name).(*gtk.TreeView)
}
Expand Down Expand Up @@ -241,3 +246,50 @@ func openURLInBrowser(address string) error {
args = append(args, address)
return exec.Command(cmd, args...).Start()
}

func buildExtendedEntry(builder *gtk.Builder, overlayID string) *gtk.Entry {
overlay := getOverlayObj(builder, overlayID)

// Create a new Entry
entry, err := gtk.EntryNew()
fatalErrorCheck(err)
entry.SetCanFocus(true)
entry.SetHExpand(true)
entry.SetEditable(false)

setCSSClass(&entry.Widget, "copyable_entry")

// Create a new Button
button, err := gtk.ButtonNewFromIconName("edit-copy-symbolic", gtk.ICON_SIZE_BUTTON)
fatalErrorCheck(err)

button.SetTooltipText("Copy to Clipboard") // TODO: Not working!
button.SetHAlign(gtk.ALIGN_END)
button.SetVAlign(gtk.ALIGN_CENTER)
button.SetHExpand(false)
button.SetVExpand(false)
button.SetBorderWidth(0)

setCSSClass(&button.Widget, "inline_button")

// Set the click event for the Button
button.Connect("clicked", func() {
buffer, _ := entry.GetText()
clipboard, _ := gtk.ClipboardGet(gdk.SELECTION_CLIPBOARD)
clipboard.SetText(buffer)
})

overlay.Add(entry)
overlay.AddOverlay(button)

overlay.ShowAll() // Ensure all child widgets are shown

return entry
}

func setCSSClass(widget *gtk.Widget, name string) {
styleContext, err := widget.GetStyleContext()
fatalErrorCheck(err)

styleContext.AddClass(name)
}
6 changes: 2 additions & 4 deletions www/grpc/statik/statik.go

Large diffs are not rendered by default.