refactor and shizz
This commit is contained in:
19
src/components/base/button.cpp
Normal file
19
src/components/base/button.cpp
Normal file
@@ -0,0 +1,19 @@
|
||||
#include "components/base/button.hpp"
|
||||
|
||||
#include "sigc++/functors/mem_fun.h"
|
||||
|
||||
|
||||
Button::Button(const std::string label)
|
||||
: Gtk::Button(label) {
|
||||
signal_clicked().connect(
|
||||
sigc::mem_fun(*this, &Button::on_clicked));
|
||||
this->add_css_class("button");
|
||||
}
|
||||
|
||||
Button::Button(Gtk::Image &image)
|
||||
: Gtk::Button() {
|
||||
set_child(image);
|
||||
signal_clicked().connect(
|
||||
sigc::mem_fun(*this, &Button::on_clicked));
|
||||
this->add_css_class("button");
|
||||
}
|
||||
@@ -3,10 +3,7 @@
|
||||
#include "gtkmm/label.h"
|
||||
#include "gtkmm/object.h"
|
||||
|
||||
Popover::Popover(std::string icon, std::string name) {
|
||||
auto label = Gtk::make_managed<Gtk::Label>(icon);
|
||||
label->add_css_class("icon-label");
|
||||
set_child(*label);
|
||||
Popover::Popover(const std::string icon, std::string name): Button(icon) {
|
||||
signal_clicked().connect(sigc::mem_fun(*this, &Popover::on_toggle_window));
|
||||
|
||||
popover = new Gtk::Popover();
|
||||
|
||||
@@ -2,8 +2,7 @@
|
||||
|
||||
#include <gtkmm/label.h>
|
||||
#include <string>
|
||||
|
||||
#include "gtkmm/button.h"
|
||||
#include "components/base/button.hpp"
|
||||
|
||||
TodoEntry::TodoEntry(int id, std::string text, sigc::signal<void(int)> signal_dismissed, sigc::signal<void(int, std::string)> signal_edited)
|
||||
: Gtk::Box(Gtk::Orientation::HORIZONTAL) {
|
||||
@@ -30,22 +29,19 @@ TodoEntry::TodoEntry(int id, std::string text, sigc::signal<void(int)> signal_di
|
||||
buttonBox->set_valign(Gtk::Align::CENTER);
|
||||
append(*buttonBox);
|
||||
|
||||
auto dismissButton = Gtk::make_managed<Gtk::Button>("\uf00d");
|
||||
auto dismissButton = Gtk::make_managed<Button>("\uf00d");
|
||||
dismissButton->set_valign(Gtk::Align::CENTER);
|
||||
dismissButton->set_tooltip_text("Dismiss");
|
||||
|
||||
dismissButton->signal_clicked().connect(sigc::mem_fun(*this, &TodoEntry::on_dismiss_clicked));
|
||||
|
||||
auto editButton = Gtk::make_managed<Gtk::Button>("\uf044");
|
||||
auto editButton = Gtk::make_managed<Button>("\uf044");
|
||||
editButton->set_valign(Gtk::Align::CENTER);
|
||||
|
||||
buttonBox->append(*editButton);
|
||||
buttonBox->append(*dismissButton);
|
||||
}
|
||||
|
||||
TodoEntry::~TodoEntry() {
|
||||
}
|
||||
|
||||
void TodoEntry::on_dismiss_clicked() {
|
||||
this->signal_dismissed.emit(this->id);
|
||||
}
|
||||
Reference in New Issue
Block a user