1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
|
--- src/ui/dialog/styledialog.h (before formatting)
+++ src/ui/dialog/styledialog.h (after formatting)
@@ -28,11 +28,11 @@
#include <gtkmm/paned.h>
#include <gtkmm/scrolledwindow.h>
#include <gtkmm/switch.h>
+#include <gtkmm/tooltip.h>
#include <gtkmm/treemodelfilter.h>
#include <gtkmm/treeselection.h>
#include <gtkmm/treestore.h>
#include <gtkmm/treeview.h>
-#include <gtkmm/tooltip.h>
#include <gtkmm/viewport.h>
#include <ui/widget/panel.h>
@@ -128,10 +128,10 @@
void _valueEdited(const Glib::ustring &path, const Glib::ustring &value, Glib::RefPtr<Gtk::TreeStore> store);
void _startNameEdit(Gtk::CellEditable *cell, const Glib::ustring &path);
- void _startValueEdit(Gtk::CellEditable* cell, const Glib::ustring& path, Glib::RefPtr<Gtk::TreeStore> store);
+ void _startValueEdit(Gtk::CellEditable *cell, const Glib::ustring &path, Glib::RefPtr<Gtk::TreeStore> store);
void _setAutocompletion(Gtk::Entry *entry, SPStyleEnum const cssenum[]);
void _setAutocompletion(Gtk::Entry *entry, Glib::ustring name);
- bool _on_foreach_iter(const Gtk::TreeModel::iterator& iter);
+ bool _on_foreach_iter(const Gtk::TreeModel::iterator &iter);
void _reload();
// Update watchers
--- src/ui/dialog/styledialog.cpp (before formatting)
+++ src/ui/dialog/styledialog.cpp (after formatting)
@@ -458,8 +458,8 @@
value->property_editable() = true;
value->signal_edited().connect(
sigc::bind<Glib::RefPtr<Gtk::TreeStore>>(sigc::mem_fun(*this, &StyleDialog::_valueEdited), store));
- value->signal_editing_started().connect( sigc::bind<Glib::RefPtr<Gtk::TreeStore> >(sigc::mem_fun(*this,
- &StyleDialog::_startValueEdit), store));
+ value->signal_editing_started().connect(
+ sigc::bind<Glib::RefPtr<Gtk::TreeStore>>(sigc::mem_fun(*this, &StyleDialog::_startValueEdit), store));
addCol = css_tree->append_column("CSS Value", *value) - 1;
col = css_tree->get_column(addCol);
if (col) {
@@ -571,11 +571,11 @@
}
Gtk::CellRendererText *value = Gtk::manage(new Gtk::CellRendererText());
value->property_editable() = true;
- value->property_placeholder_text() = _("value");
+ value->property_placeholder_text() = _("value");
value->signal_edited().connect(
sigc::bind<Glib::RefPtr<Gtk::TreeStore>>(sigc::mem_fun(*this, &StyleDialog::_valueEdited), store));
- value->signal_editing_started().connect( sigc::bind<Glib::RefPtr<Gtk::TreeStore> >(sigc::mem_fun(*this,
- &StyleDialog::_startValueEdit), store));
+ value->signal_editing_started().connect(
+ sigc::bind<Glib::RefPtr<Gtk::TreeStore>>(sigc::mem_fun(*this, &StyleDialog::_startValueEdit), store));
addCol = css_tree->append_column("CSS Value", *value) - 1;
col = css_tree->get_column(addCol);
if (col) {
@@ -614,8 +614,7 @@
guint32 r2 = 0; // if there's no color, return black
r2 = sp_svg_read_color(iter->get_value().c_str(), r2);
if (attr_prop.count(iter->name) ||
- (value != iter->get_value() && ((r1 & 0x000000ff) == 0 || r1 != r2)))
- {
+ (value != iter->get_value() && ((r1 & 0x000000ff) == 0 || r1 != r2))) {
row[_mColumns._colStrike] = true;
row[_mColumns._colOwner] = Glib::ustring("");
} else {
@@ -695,9 +694,11 @@
Gtk::CellRendererText *label = Gtk::manage(new Gtk::CellRendererText());
label->property_placeholder_text() = _("property");
label->property_editable() = true;
- label->signal_edited().connect(sigc::bind<Glib::RefPtr<Gtk::TreeStore>, Gtk::TreeView *>(
- sigc::mem_fun(*this, &StyleDialog::_nameEdited), store, css_tree));
- label->signal_editing_started().connect(sigc::mem_fun(*this, &StyleDialog::_startNameEdit));
+ label->signal_edited().connect(
+ sigc::bind<Glib::RefPtr<Gtk::TreeStore>, Gtk::TreeView *>(
+ sigc::mem_fun(*this, &StyleDialog::_nameEdited), store, css_tree));
+ label->signal_editing_started().connect(
+ sigc::mem_fun(*this, &StyleDialog::_startNameEdit));
addCol = css_tree->append_column("CSS Property", *label) - 1;
col = css_tree->get_column(addCol);
if (col) {
@@ -706,11 +707,11 @@
Gtk::CellRendererText *value = Gtk::manage(new Gtk::CellRendererText());
value->property_placeholder_text() = _("value");
value->property_editable() = true;
- value->signal_edited().connect(
- sigc::bind<Glib::RefPtr<Gtk::TreeStore>>(sigc::mem_fun(*this, &StyleDialog::_valueEdited), store));
- value->signal_editing_started().connect( sigc::bind<Glib::RefPtr<Gtk::TreeStore> >(sigc::mem_fun(*this,
- &StyleDialog::_startValueEdit), store));
-
+ value->signal_edited().connect(sigc::bind<Glib::RefPtr<Gtk::TreeStore>>(
+ sigc::mem_fun(*this, &StyleDialog::_valueEdited), store));
+ value->signal_editing_started().connect(sigc::bind<Glib::RefPtr<Gtk::TreeStore>>(
+ sigc::mem_fun(*this, &StyleDialog::_startValueEdit), store));
+
addCol = css_tree->append_column("CSS Value", *value) - 1;
col = css_tree->get_column(addCol);
if (col) {
@@ -764,8 +765,8 @@
_updating = false;
}
-bool
-StyleDialog::_on_foreach_iter(const Gtk::TreeModel::iterator& iter) {
+bool StyleDialog::_on_foreach_iter(const Gtk::TreeModel::iterator &iter)
+{
Gtk::TreeModel::Row row = *(iter);
Glib::ustring owner = row[_mColumns._colOwner];
if (owner.empty()) {
@@ -792,8 +793,7 @@
}
}
-void
-StyleDialog::_addOwnerStyle(Glib::ustring name, Glib::ustring selector)
+void StyleDialog::_addOwnerStyle(Glib::ustring name, Glib::ustring selector)
{
if (_ownerStyle.find(name) == _ownerStyle.end()) {
_ownerStyle[name] = selector;
@@ -958,8 +958,7 @@
return false;
}
-void
-StyleDialog::_setAutocompletion(Gtk::Entry *entry, SPStyleEnum const cssenum[])
+void StyleDialog::_setAutocompletion(Gtk::Entry *entry, SPStyleEnum const cssenum[])
{
Glib::RefPtr<Gtk::ListStore> completionModel = Gtk::ListStore::create(_mCSSData);
Glib::RefPtr<Gtk::EntryCompletion> entry_completion = Gtk::EntryCompletion::create();
@@ -978,17 +977,16 @@
entry->set_completion(entry_completion);
}
/*Harcode values non in enum*/
-void
-StyleDialog::_setAutocompletion(Gtk::Entry *entry, Glib::ustring name)
+void StyleDialog::_setAutocompletion(Gtk::Entry *entry, Glib::ustring name)
{
Glib::RefPtr<Gtk::ListStore> completionModel = Gtk::ListStore::create(_mCSSData);
Glib::RefPtr<Gtk::EntryCompletion> entry_completion = Gtk::EntryCompletion::create();
entry_completion->set_model(completionModel);
- entry_completion->set_text_column (_mCSSData._colCSSData);
+ entry_completion->set_text_column(_mCSSData._colCSSData);
entry_completion->set_minimum_key_length(0);
entry_completion->set_popup_completion(true);
gint counter = 0;
- if(name == "paint-order") {
+ if (name == "paint-order") {
Gtk::TreeModel::Row row = *(completionModel->append());
row[_mCSSData._colCSSData] = Glib::ustring("fill markers stroke");
row = *(completionModel->append());
@@ -1090,7 +1088,7 @@
Gtk::TreeModel::Row row = *store->get_iter(path);
Gtk::TreeModel::Path pathel = (Gtk::TreeModel::Path)*store->get_iter(path);
- if (row ) {
+ if (row) {
gint pos = row[_mColumns._colSelectorPos];
bool write = false;
if (row[_mColumns._colName] != name && row[_mColumns._colValue] != "") {
|
