summaryrefslogtreecommitdiffstats
path: root/src/ui/dialog
diff options
context:
space:
mode:
authorJabier Arraiza <jabier.arraiza@marker.es>2018-12-24 18:08:45 +0000
committerJabiertxof <jabier.arraiza@marker.es>2018-12-26 11:46:59 +0000
commit43b6199dbd09a75e19a5808a99813bfeada2292f (patch)
tree8f70a4c590b056c45f5d1bddf69cb34e73b7ed04 /src/ui/dialog
parentadd "add" button on same place (diff)
downloadinkscape-43b6199dbd09a75e19a5808a99813bfeada2292f.tar.gz
inkscape-43b6199dbd09a75e19a5808a99813bfeada2292f.zip
Fixing styles
Diffstat (limited to 'src/ui/dialog')
-rw-r--r--src/ui/dialog/attrdialog.cpp17
-rw-r--r--src/ui/dialog/attrdialog.h12
-rw-r--r--src/ui/dialog/cssdialog.cpp25
-rw-r--r--src/ui/dialog/cssdialog.h10
-rw-r--r--src/ui/dialog/xml-tree.h10
5 files changed, 36 insertions, 38 deletions
diff --git a/src/ui/dialog/attrdialog.cpp b/src/ui/dialog/attrdialog.cpp
index 7861e13b5..21e92f600 100644
--- a/src/ui/dialog/attrdialog.cpp
+++ b/src/ui/dialog/attrdialog.cpp
@@ -103,13 +103,13 @@ AttrDialog::AttrDialog():
status.set_size_request(1, -1);
status.set_markup("");
status.set_line_wrap(true);
- status_box.pack_start( status, TRUE, TRUE, 0);
+ status_box.pack_start(status, TRUE, TRUE, 0);
_getContents()->pack_end(status_box, false, false, 2);
_message_stack = std::make_shared<Inkscape::MessageStack>();
_message_context = std::unique_ptr<Inkscape::MessageContext>(new Inkscape::MessageContext(_message_stack));
- _message_changed_connection = _message_stack->connectChanged(
- sigc::bind(sigc::ptr_fun(_set_status_message), GTK_WIDGET(status.gobj())));
+ _message_changed_connection =
+ _message_stack->connectChanged(sigc::bind(sigc::ptr_fun(_set_status_message), GTK_WIDGET(status.gobj())));
_valueRenderer = Gtk::manage(new Gtk::CellRendererText());
_valueRenderer->property_editable() = true;
@@ -198,13 +198,12 @@ void AttrDialog::_set_status_message(Inkscape::MessageType /*type*/, const gchar
void AttrDialog::attr_reset_context(gint attr)
{
if (attr == 0) {
- _message_context->set(Inkscape::NORMAL_MESSAGE,
- _("<b>Click</b> attribute to edit."));
- }
- else {
+ _message_context->set(Inkscape::NORMAL_MESSAGE, _("<b>Click</b> attribute to edit."));
+ } else {
const gchar *name = g_quark_to_string(attr);
- _message_context->setF(Inkscape::NORMAL_MESSAGE,
- _("Attribute <b>%s</b> selected. Press <b>Ctrl+Enter</b> when done editing to commit changes."), name);
+ _message_context->setF(
+ Inkscape::NORMAL_MESSAGE,
+ _("Attribute <b>%s</b> selected. Press <b>Ctrl+Enter</b> when done editing to commit changes."), name);
}
}
diff --git a/src/ui/dialog/attrdialog.h b/src/ui/dialog/attrdialog.h
index b263120ce..93d9a1277 100644
--- a/src/ui/dialog/attrdialog.h
+++ b/src/ui/dialog/attrdialog.h
@@ -13,13 +13,13 @@
#ifndef ATTRDIALOG_H
#define ATTRDIALOG_H
-#include <gtkmm/treeview.h>
+#include "desktop.h"
+#include "message.h"
+#include <gtkmm/dialog.h>
#include <gtkmm/liststore.h>
#include <gtkmm/scrolledwindow.h>
-#include <gtkmm/dialog.h>
+#include <gtkmm/treeview.h>
#include <ui/widget/panel.h>
-#include "message.h"
-#include "desktop.h"
#define ATTR_DIALOG(obj) (dynamic_cast<Inkscape::UI::Dialog::AttrDialog*>((Inkscape::UI::Dialog::AttrDialog*)obj))
@@ -85,8 +85,8 @@ public:
void setRepr(Inkscape::XML::Node * repr);
void setUndo(Glib::ustring const &event_description);
/**
- * Sets the XML status bar, depending on which attr is selected.
- */
+ * Sets the XML status bar, depending on which attr is selected.
+ */
void attr_reset_context(gint attr);
static void _set_status_message(Inkscape::MessageType type, const gchar *message, GtkWidget *dialog);
diff --git a/src/ui/dialog/cssdialog.cpp b/src/ui/dialog/cssdialog.cpp
index 903bed90d..9b68c207c 100644
--- a/src/ui/dialog/cssdialog.cpp
+++ b/src/ui/dialog/cssdialog.cpp
@@ -14,12 +14,12 @@
#include "cssdialog.h"
-#include "verbs.h"
-#include "selection.h"
#include "message-context.h"
#include "message-stack.h"
+#include "selection.h"
#include "ui/icon-loader.h"
#include "ui/widget/iconrenderer.h"
+#include "verbs.h"
#include "xml/attribute-record.h"
#include <glibmm/i18n.h>
@@ -50,7 +50,7 @@ CssDialog::CssDialog():
_store = Gtk::ListStore::create(_cssColumns);
_treeView.set_model(_store);
- Inkscape::UI::Widget::IconRenderer * addRenderer = manage(new Inkscape::UI::Widget::IconRenderer());
+ Inkscape::UI::Widget::IconRenderer *addRenderer = manage(new Inkscape::UI::Widget::IconRenderer());
addRenderer->add_icon("edit-delete");
_treeView.append_column("", *addRenderer);
@@ -96,13 +96,13 @@ CssDialog::CssDialog():
status.set_size_request(1, -1);
status.set_markup("");
status.set_line_wrap(true);
- status_box.pack_start( status, TRUE, TRUE, 0);
+ status_box.pack_start(status, TRUE, TRUE, 0);
_getContents()->pack_end(status_box, false, false, 2);
_message_stack = std::make_shared<Inkscape::MessageStack>();
_message_context = std::unique_ptr<Inkscape::MessageContext>(new Inkscape::MessageContext(_message_stack));
- _message_changed_connection = _message_stack->connectChanged(
- sigc::bind(sigc::ptr_fun(_set_status_message), GTK_WIDGET(status.gobj())));
+ _message_changed_connection =
+ _message_stack->connectChanged(sigc::bind(sigc::ptr_fun(_set_status_message), GTK_WIDGET(status.gobj())));
_getContents()->pack_start(_mainBox, Gtk::PACK_EXPAND_WIDGET);
@@ -148,13 +148,12 @@ void CssDialog::setDesktop(SPDesktop* desktop)
void CssDialog::css_reset_context(gint css)
{
if (css == 0) {
- _message_context->set(Inkscape::NORMAL_MESSAGE,
- _("<b>Click</b> CSS property to edit."));
- }
- else {
+ _message_context->set(Inkscape::NORMAL_MESSAGE, _("<b>Click</b> CSS property to edit."));
+ } else {
const gchar *name = g_quark_to_string(css);
- _message_context->setF(Inkscape::NORMAL_MESSAGE,
- _("Propery <b>%s</b> selected. Press <b>Ctrl+Enter</b> when done editing to commit changes."), name);
+ _message_context->setF(
+ Inkscape::NORMAL_MESSAGE,
+ _("Propery <b>%s</b> selected. Press <b>Ctrl+Enter</b> when done editing to commit changes."), name);
}
}
@@ -166,7 +165,7 @@ void CssDialog::css_reset_context(gint css)
*/
bool CssDialog::_addProperty(GdkEventButton *event)
{
- if(event->type == GDK_BUTTON_RELEASE && event->button == 1) {
+ if (event->type == GDK_BUTTON_RELEASE && event->button == 1) {
_propRow = *(_store->append());
return true;
}
diff --git a/src/ui/dialog/cssdialog.h b/src/ui/dialog/cssdialog.h
index b35ce3e90..36fcc831a 100644
--- a/src/ui/dialog/cssdialog.h
+++ b/src/ui/dialog/cssdialog.h
@@ -15,12 +15,12 @@
#ifndef CSSDIALOG_H
#define CSSDIALOG_H
-#include <gtkmm/treeview.h>
+#include "message.h"
+#include <gtkmm/dialog.h>
#include <gtkmm/liststore.h>
#include <gtkmm/scrolledwindow.h>
-#include <gtkmm/dialog.h>
+#include <gtkmm/treeview.h>
#include <ui/widget/panel.h>
-#include "message.h"
#include "desktop.h"
@@ -81,8 +81,8 @@ public:
Gtk::Label status;
/**
- * Sets the XML status bar, depending on which attr is selected.
- */
+ * Sets the XML status bar, depending on which attr is selected.
+ */
void css_reset_context(gint css);
static void _set_status_message(Inkscape::MessageType type, const gchar *message, GtkWidget *dialog);
diff --git a/src/ui/dialog/xml-tree.h b/src/ui/dialog/xml-tree.h
index b39c4d1be..52e9442ba 100644
--- a/src/ui/dialog/xml-tree.h
+++ b/src/ui/dialog/xml-tree.h
@@ -15,15 +15,15 @@
#include <memory>
-#include "ui/widget/panel.h"
#include "ui/widget/ink-flow-box.h"
+#include "ui/widget/panel.h"
+#include <gtkmm/button.h>
#include <gtkmm/entry.h>
+#include <gtkmm/paned.h>
+#include <gtkmm/scrolledwindow.h>
+#include <gtkmm/separatortoolitem.h>
#include <gtkmm/textview.h>
#include <gtkmm/toolbar.h>
-#include <gtkmm/separatortoolitem.h>
-#include <gtkmm/scrolledwindow.h>
-#include <gtkmm/paned.h>
-#include <gtkmm/button.h>
#include "ui/dialog/attrdialog.h"
#include "ui/dialog/cssdialog.h"