Commit 57831670 authored by Jabier Arraiza's avatar Jabier Arraiza

Fixing coding style

parent f958a8f1
Pipeline #65518976 failed with stages
in 3 minutes and 48 seconds
......@@ -2024,7 +2024,7 @@ SPDesktop::show_dialogs()
mapVerbPreference.insert(std::make_pair ("Symbols", "/dialogs/symbols") );
mapVerbPreference.insert(std::make_pair ("ObjectsPanel", "/dialogs/objects") );
mapVerbPreference.insert(std::make_pair ("Prototype", "/dialogs/prototype") );
mapVerbPreference.insert(std::make_pair ("Selectors", "/dialogs/selectors") );
mapVerbPreference.insert(std::make_pair("Selectors", "/dialogs/selectors"));
for (std::map<Glib::ustring, Glib::ustring>::const_iterator iter = mapVerbPreference.begin(); iter != mapVerbPreference.end(); ++iter) {
......
......@@ -45,18 +45,18 @@
#include "ui/dialog/layers.h"
#include "ui/dialog/icon-preview.h"
//#include "ui/dialog/print-colors-preview-dialog.h"
#include "util/ege-appear-time-tracker.h"
#include "ui/dialog/clonetiler.h"
#include "ui/dialog/export.h"
#include "ui/dialog/object-attributes.h"
#include "ui/dialog/object-properties.h"
#include "ui/dialog/text-edit.h"
#include "ui/dialog/spellcheck.h"
#include "ui/dialog/export.h"
#include "ui/dialog/xml-tree.h"
#include "ui/dialog/clonetiler.h"
#include "ui/dialog/svg-fonts-dialog.h"
#include "ui/dialog/objects.h"
#include "ui/dialog/selectorsdialog.h"
#include "ui/dialog/spellcheck.h"
#include "ui/dialog/styledialog.h"
#include "ui/dialog/svg-fonts-dialog.h"
#include "ui/dialog/text-edit.h"
#include "ui/dialog/xml-tree.h"
#include "util/ege-appear-time-tracker.h"
namespace Inkscape {
namespace UI {
namespace Dialog {
......
This diff is collapsed.
......@@ -15,6 +15,10 @@
#ifndef SELECTORSDIALOG_H
#define SELECTORSDIALOG_H
#include "ui/dialog/desktop-tracker.h"
#include "ui/dialog/dialog-manager.h"
#include "ui/dialog/styledialog.h"
#include "ui/widget/panel.h"
#include <gtkmm/dialog.h>
#include <gtkmm/paned.h>
#include <gtkmm/scrolledwindow.h>
......@@ -24,10 +28,6 @@
#include <gtkmm/treestore.h>
#include <gtkmm/treeview.h>
#include <ui/widget/panel.h>
#include "ui/dialog/dialog-manager.h"
#include "ui/dialog/styledialog.h"
#include "ui/dialog/desktop-tracker.h"
#include "ui/widget/panel.h"
#include "xml/helper-observer.h"
......@@ -48,7 +48,7 @@ namespace Dialog {
*/
class SelectorsDialog : public Widget::Panel {
public:
public:
~SelectorsDialog() override;
// No default constructor, noncopyable, nonassignable
SelectorsDialog();
......@@ -56,7 +56,8 @@ public:
SelectorsDialog operator=(SelectorsDialog const &d) = delete;
static SelectorsDialog &getInstance() { return *new SelectorsDialog(); }
private:
private:
// Monitor <style> element for changes.
class NodeObserver;
......@@ -64,7 +65,7 @@ private:
class NodeWatcher;
enum SelectorType { CLASS, ID, TAG };
void fixCSSSelectors(Glib::ustring &selector);
std::vector<SelectorsDialog::NodeWatcher*> _nodeWatchers;
std::vector<SelectorsDialog::NodeWatcher *> _nodeWatchers;
void _nodeAdded( Inkscape::XML::Node &repr );
void _nodeRemoved( Inkscape::XML::Node &repr );
void _nodeChanged( Inkscape::XML::Node &repr );
......@@ -107,7 +108,7 @@ private:
static Glib::RefPtr<SelectorsDialog::TreeStore> create(SelectorsDialog *styledialog);
private:
SelectorsDialog *_selectorsdialog;
SelectorsDialog *_selectorsdialog;
};
// TreeView
......@@ -117,7 +118,7 @@ private:
// Widgets
Gtk::Paned _paned;
Gtk::Switch _direction;
Gtk::Box _button_box;
Gtk::Box _button_box;
Gtk::Box _selectors_box;
Gtk::ScrolledWindow _scrolled_window_style;
Gtk::ScrolledWindow _scrolled_window_selectors;
......
......@@ -229,11 +229,7 @@ StyleDialog::StyleDialog()
_readStyleElement();
}
void
StyleDialog::_vscrool()
{
_scroolpos = vadj->get_value();
}
void StyleDialog::_vscrool() { _scroolpos = vadj->get_value(); }
/**
* Class destructor
......
......@@ -111,7 +111,7 @@ class StyleDialog : public Widget::Panel {
// Widgets
Gtk::ScrolledWindow _scrolledWindow;
Glib::RefPtr< Gtk::Adjustment > vadj;
Glib::RefPtr<Gtk::Adjustment> vadj;
Gtk::Box _mainBox;
Gtk::Box _styleBox;
Gtk::Switch *_all_css;
......
......@@ -3107,8 +3107,9 @@ Verb *Verb::_base_verbs[] = {
INKSCAPE_ICON("dialog-text-and-font")),
new DialogVerb(SP_VERB_DIALOG_XML_EDITOR, "DialogXMLEditor", N_("_XML Editor..."),
N_("View and edit the XML tree of the document"), INKSCAPE_ICON("dialog-xml-editor")),
new DialogVerb(SP_VERB_DIALOG_SELECTORS, "DialogSelectors", N_("_Selectors & CSS..."), N_("View and edit selections and CSS styles"), INKSCAPE_ICON("dialog-selectors")),
new DialogVerb(SP_VERB_DIALOG_SELECTORS, "DialogSelectors", N_("_Selectors & CSS..."),
N_("View and edit selections and CSS styles"), INKSCAPE_ICON("dialog-selectors")),
new DialogVerb(SP_VERB_DIALOG_FIND, "DialogFind", N_("_Find/Replace..."), N_("Find objects in document"),
INKSCAPE_ICON("edit-find")),
new DialogVerb(SP_VERB_DIALOG_SPELLCHECK, "DialogSpellcheck", N_("Check Spellin_g..."),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment