summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ui/CMakeLists.txt2
-rw-r--r--src/ui/dialog/color-item.cpp39
-rw-r--r--src/ui/dialog/color-item.h12
-rw-r--r--src/ui/dialog/swatches.cpp44
-rw-r--r--src/ui/previewable.h9
-rw-r--r--src/ui/previewholder.cpp42
-rw-r--r--src/ui/previewholder.h18
-rw-r--r--src/ui/widget/panel.cpp4
-rw-r--r--src/ui/widget/preview.cpp (renamed from src/widgets/eek-preview.cpp)46
-rw-r--r--src/ui/widget/preview.h (renamed from src/widgets/eek-preview.h)11
-rw-r--r--src/widgets/CMakeLists.txt2
11 files changed, 133 insertions, 96 deletions
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index a0a540970..80c07f8b9 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -186,6 +186,7 @@ set(ui_SRC
widget/panel.cpp
widget/point.cpp
widget/preferences-widget.cpp
+ widget/preview.cpp
widget/random.cpp
widget/registered-widget.cpp
widget/registry.cpp
@@ -412,6 +413,7 @@ set(ui_SRC
widget/panel.h
widget/point.h
widget/preferences-widget.h
+ widget/preview.h
widget/random.h
widget/registered-enums.h
widget/registered-widget.h
diff --git a/src/ui/dialog/color-item.cpp b/src/ui/dialog/color-item.cpp
index d5d254e5d..ad355f8d2 100644
--- a/src/ui/dialog/color-item.cpp
+++ b/src/ui/dialog/color-item.cpp
@@ -178,7 +178,7 @@ static bool popVal( guint64& numVal, std::string& str )
}
// TODO resolve this more cleanly:
-extern bool colorItemHandleButtonPress(GdkEventButton* event, EekPreview *preview, gpointer user_data);
+extern bool colorItemHandleButtonPress(GdkEventButton* event, UI::Widget::Preview *preview, gpointer user_data);
void
ColorItem::drag_begin(const Glib::RefPtr<Gdk::DragContext> &dc)
@@ -307,18 +307,18 @@ void ColorItem::setState( bool fill, bool stroke )
_isStroke = stroke;
for ( auto widget : _previews ) {
- auto preview = dynamic_cast<EekPreview *>(widget);
+ auto preview = dynamic_cast<UI::Widget::Preview *>(widget);
if (preview) {
int val = preview->get_linked();
- val &= ~(PREVIEW_FILL | PREVIEW_STROKE);
+ val &= ~(UI::Widget::PREVIEW_FILL | UI::Widget::PREVIEW_STROKE);
if ( _isFill ) {
- val |= PREVIEW_FILL;
+ val |= UI::Widget::PREVIEW_FILL;
}
if ( _isStroke ) {
- val |= PREVIEW_STROKE;
+ val |= UI::Widget::PREVIEW_STROKE;
}
- preview->set_linked(static_cast<LinkType>(val));
+ preview->set_linked(static_cast<UI::Widget::LinkType>(val));
}
}
}
@@ -339,7 +339,7 @@ void ColorItem::setName(const Glib::ustring name)
//def.descr = name;
for (auto widget : _previews) {
- auto preview = dynamic_cast<EekPreview *>(widget);
+ auto preview = dynamic_cast<UI::Widget::Preview *>(widget);
auto label = dynamic_cast<Gtk::Label *>(widget);
if (preview) {
preview->set_tooltip_text(name);
@@ -409,7 +409,7 @@ void ColorItem::_colorDefChanged(void* data)
void ColorItem::_updatePreviews()
{
for (auto widget : _previews) {
- auto preview = dynamic_cast<EekPreview *>(widget);
+ auto preview = dynamic_cast<UI::Widget::Preview *>(widget);
if (preview) {
_regenPreview(preview);
preview->queue_draw();
@@ -480,7 +480,7 @@ void ColorItem::_updatePreviews()
}
-void ColorItem::_regenPreview(EekPreview * preview)
+void ColorItem::_regenPreview(UI::Widget::Preview * preview)
{
if ( def.getType() != ege::PaintDef::RGB ) {
using Inkscape::IO::Resource::get_path;
@@ -521,27 +521,32 @@ void ColorItem::_regenPreview(EekPreview * preview)
preview->set_pixbuf(pixbuf);
}
- preview->set_linked((LinkType)((_linkSrc ? PREVIEW_LINK_IN:0)
- | (_listeners.empty() ? 0:PREVIEW_LINK_OUT)
- | (_isLive ? PREVIEW_LINK_OTHER:0)) );
+ preview->set_linked(static_cast<UI::Widget::LinkType>( (_linkSrc ? UI::Widget::PREVIEW_LINK_IN : 0)
+ | (_listeners.empty() ? 0 : UI::Widget::PREVIEW_LINK_OUT)
+ | (_isLive ? UI::Widget::PREVIEW_LINK_OTHER:0)) );
}
-Gtk::Widget* ColorItem::getPreview(PreviewStyle style, ViewType view, ::PreviewSize size, guint ratio, guint border)
+Gtk::Widget*
+ColorItem::getPreview(UI::Widget::PreviewStyle style,
+ UI::Widget::ViewType view,
+ UI::Widget::PreviewSize size,
+ guint ratio,
+ guint border)
{
Gtk::Widget* widget = nullptr;
- if ( style == PREVIEW_STYLE_BLURB) {
+ if ( style == UI::Widget::PREVIEW_STYLE_BLURB) {
Gtk::Label *lbl = new Gtk::Label(def.descr);
lbl->set_halign(Gtk::ALIGN_START);
lbl->set_valign(Gtk::ALIGN_CENTER);
widget = lbl;
} else {
- auto preview = Gtk::manage(new EekPreview());
+ auto preview = Gtk::manage(new UI::Widget::Preview());
preview->set_name("ColorItemPreview");
_regenPreview(preview);
- preview->set_details((::ViewType)view,
- (::PreviewSize)size,
+ preview->set_details((UI::Widget::ViewType)view,
+ (UI::Widget::PreviewSize)size,
ratio,
border );
diff --git a/src/ui/dialog/color-item.h b/src/ui/dialog/color-item.h
index 47a694bae..7210ed292 100644
--- a/src/ui/dialog/color-item.h
+++ b/src/ui/dialog/color-item.h
@@ -51,11 +51,11 @@ public:
~ColorItem() override;
ColorItem(ColorItem const &other);
virtual ColorItem &operator=(ColorItem const &other);
- Gtk::Widget* getPreview(PreviewStyle style,
- ViewType view,
- ::PreviewSize size,
- guint ratio,
- guint border) override;
+ Gtk::Widget* getPreview(UI::Widget::PreviewStyle style,
+ UI::Widget::ViewType view,
+ UI::Widget::PreviewSize size,
+ guint ratio,
+ guint border) override;
void buttonClicked(bool secondary = false);
void setGradient(SPGradient *grad);
@@ -88,7 +88,7 @@ private:
static void _colorDefChanged(void* data);
void _updatePreviews();
- void _regenPreview(EekPreview * preview);
+ void _regenPreview(UI::Widget::Preview * preview);
void _linkTint( ColorItem& other, int percent );
void _linkTone( ColorItem& other, int percent, int grayLevel );
diff --git a/src/ui/dialog/swatches.cpp b/src/ui/dialog/swatches.cpp
index 7e348d18b..fabbf720b 100644
--- a/src/ui/dialog/swatches.cpp
+++ b/src/ui/dialog/swatches.cpp
@@ -248,7 +248,7 @@ static void removeit( GtkWidget *widget, gpointer data )
}
/* extern'ed from color-item.cpp */
-bool colorItemHandleButtonPress(GdkEventButton* event, EekPreview *preview, gpointer user_data)
+bool colorItemHandleButtonPress(GdkEventButton* event, UI::Widget::Preview *preview, gpointer user_data)
{
gboolean handled = FALSE;
@@ -695,10 +695,10 @@ void SwatchesPanel::_build_menu()
if (!_prefs_path.empty()) {
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
panel_wrap = prefs->getBool(_prefs_path + "/panel_wrap");
- panel_size = prefs->getIntLimited(_prefs_path + "/panel_size", 1, 0, PREVIEW_SIZE_HUGE);
+ panel_size = prefs->getIntLimited(_prefs_path + "/panel_size", 1, 0, UI::Widget::PREVIEW_SIZE_HUGE);
panel_mode = prefs->getIntLimited(_prefs_path + "/panel_mode", 1, 0, 10);
panel_ratio = prefs->getIntLimited(_prefs_path + "/panel_ratio", 100, 0, 500 );
- panel_border = prefs->getIntLimited(_prefs_path + "/panel_border", BORDER_NONE, 0, 2 );
+ panel_border = prefs->getIntLimited(_prefs_path + "/panel_border", UI::Widget::BORDER_NONE, 0, 2 );
}
_menu = new Gtk::Menu();
@@ -890,25 +890,25 @@ void SwatchesPanel::_updateSettings(int settings, int value)
case SWATCHES_SETTINGS_SIZE: {
prefs->setInt(_prefs_path + "/panel_size", value);
- ViewType curr_type = _holder->getPreviewType();
+ auto curr_type = _holder->getPreviewType();
guint curr_ratio = _holder->getPreviewRatio();
- ::BorderStyle curr_border = _holder->getPreviewBorder();
+ auto curr_border = _holder->getPreviewBorder();
switch (value) {
case 0:
- _holder->setStyle(::PREVIEW_SIZE_TINY, curr_type, curr_ratio, curr_border);
+ _holder->setStyle(UI::Widget::PREVIEW_SIZE_TINY, curr_type, curr_ratio, curr_border);
break;
case 1:
- _holder->setStyle(::PREVIEW_SIZE_SMALL, curr_type, curr_ratio, curr_border);
+ _holder->setStyle(UI::Widget::PREVIEW_SIZE_SMALL, curr_type, curr_ratio, curr_border);
break;
case 2:
- _holder->setStyle(::PREVIEW_SIZE_MEDIUM, curr_type, curr_ratio, curr_border);
+ _holder->setStyle(UI::Widget::PREVIEW_SIZE_MEDIUM, curr_type, curr_ratio, curr_border);
break;
case 3:
- _holder->setStyle(::PREVIEW_SIZE_BIG, curr_type, curr_ratio, curr_border);
+ _holder->setStyle(UI::Widget::PREVIEW_SIZE_BIG, curr_type, curr_ratio, curr_border);
break;
case 4:
- _holder->setStyle(::PREVIEW_SIZE_HUGE, curr_type, curr_ratio, curr_border);
+ _holder->setStyle(UI::Widget::PREVIEW_SIZE_HUGE, curr_type, curr_ratio, curr_border);
break;
default:
break;
@@ -919,15 +919,15 @@ void SwatchesPanel::_updateSettings(int settings, int value)
case SWATCHES_SETTINGS_MODE: {
prefs->setInt(_prefs_path + "/panel_mode", value);
- ::PreviewSize curr_size = _holder->getPreviewSize();
+ auto curr_size = _holder->getPreviewSize();
guint curr_ratio = _holder->getPreviewRatio();
- ::BorderStyle curr_border = _holder->getPreviewBorder();
+ auto curr_border = _holder->getPreviewBorder();
switch (value) {
case 0:
- _holder->setStyle(curr_size, VIEW_TYPE_LIST, curr_ratio, curr_border);
+ _holder->setStyle(curr_size, UI::Widget::VIEW_TYPE_LIST, curr_ratio, curr_border);
break;
case 1:
- _holder->setStyle(curr_size, VIEW_TYPE_GRID, curr_ratio, curr_border);
+ _holder->setStyle(curr_size, UI::Widget::VIEW_TYPE_GRID, curr_ratio, curr_border);
break;
default:
break;
@@ -937,9 +937,9 @@ void SwatchesPanel::_updateSettings(int settings, int value)
case SWATCHES_SETTINGS_SHAPE: {
prefs->setInt(_prefs_path + "/panel_ratio", value);
- ViewType curr_type = _holder->getPreviewType();
- ::PreviewSize curr_size = _holder->getPreviewSize();
- ::BorderStyle curr_border = _holder->getPreviewBorder();
+ auto curr_type = _holder->getPreviewType();
+ auto curr_size = _holder->getPreviewSize();
+ auto curr_border = _holder->getPreviewBorder();
_holder->setStyle(curr_size, curr_type, value, curr_border);
break;
@@ -947,19 +947,19 @@ void SwatchesPanel::_updateSettings(int settings, int value)
case SWATCHES_SETTINGS_BORDER: {
prefs->setInt(_prefs_path + "/panel_border", value);
- ::PreviewSize curr_size = _holder->getPreviewSize();
- ViewType curr_type = _holder->getPreviewType();
+ auto curr_size = _holder->getPreviewSize();
+ auto curr_type = _holder->getPreviewType();
guint curr_ratio = _holder->getPreviewRatio();
switch (value) {
case 0:
- _holder->setStyle(curr_size, curr_type, curr_ratio, BORDER_NONE);
+ _holder->setStyle(curr_size, curr_type, curr_ratio, UI::Widget::BORDER_NONE);
break;
case 1:
- _holder->setStyle(curr_size, curr_type, curr_ratio, BORDER_SOLID);
+ _holder->setStyle(curr_size, curr_type, curr_ratio, UI::Widget::BORDER_SOLID);
break;
case 2:
- _holder->setStyle(curr_size, curr_type, curr_ratio, BORDER_WIDE);
+ _holder->setStyle(curr_size, curr_type, curr_ratio, UI::Widget::BORDER_WIDE);
break;
default:
break;
diff --git a/src/ui/previewable.h b/src/ui/previewable.h
index 76be394bb..6c611a668 100644
--- a/src/ui/previewable.h
+++ b/src/ui/previewable.h
@@ -15,7 +15,8 @@
#include <gtkmm/widget.h>
-#include "../widgets/eek-preview.h"
+
+#include "widget/preview.h"
namespace Inkscape {
namespace UI {
@@ -42,7 +43,11 @@ class Previewable
public:
// TODO need to add some nice parameters
virtual ~Previewable() = default;
- virtual Gtk::Widget* getPreview( PreviewStyle style, ViewType view, ::PreviewSize size, guint ratio, guint border) = 0;
+ virtual Gtk::Widget* getPreview(UI::Widget::PreviewStyle style,
+ UI::Widget::ViewType view,
+ UI::Widget::PreviewSize size,
+ guint ratio,
+ guint border) = 0;
};
diff --git a/src/ui/previewholder.cpp b/src/ui/previewholder.cpp
index 236612ab3..33ac6f062 100644
--- a/src/ui/previewholder.cpp
+++ b/src/ui/previewholder.cpp
@@ -37,11 +37,11 @@ PreviewHolder::PreviewHolder() :
_prefCols(0),
_updatesFrozen(false),
_anchor(SP_ANCHOR_CENTER),
- _baseSize(PREVIEW_SIZE_SMALL),
+ _baseSize(UI::Widget::PREVIEW_SIZE_SMALL),
_ratio(100),
- _view(VIEW_TYPE_LIST),
+ _view(UI::Widget::VIEW_TYPE_LIST),
_wrap(false),
- _border(BORDER_NONE)
+ _border(UI::Widget::BORDER_NONE)
{
set_name( "PreviewHolder" );
_scroller = Gtk::manage(new Gtk::ScrolledWindow());
@@ -102,7 +102,7 @@ void PreviewHolder::clear()
items.clear();
_prefCols = 0;
// Kludge to restore scrollbars
- if ( !_wrap && (_view != VIEW_TYPE_LIST) && (_anchor == SP_ANCHOR_NORTH || _anchor == SP_ANCHOR_SOUTH) ) {
+ if ( !_wrap && (_view != UI::Widget::VIEW_TYPE_LIST) && (_anchor == SP_ANCHOR_NORTH || _anchor == SP_ANCHOR_SOUTH) ) {
_scroller->set_policy( Gtk::POLICY_AUTOMATIC, Gtk::POLICY_NEVER );
}
rebuildUI();
@@ -123,8 +123,12 @@ void PreviewHolder::addPreview( Previewable* preview )
switch(_view) {
case VIEW_TYPE_LIST:
{
- Gtk::Widget* label = Gtk::manage(preview->getPreview(PREVIEW_STYLE_BLURB, VIEW_TYPE_LIST, _baseSize, _ratio, _border));
- Gtk::Widget* item = Gtk::manage(preview->getPreview(PREVIEW_STYLE_PREVIEW, VIEW_TYPE_LIST, _baseSize, _ratio, _border));
+ Gtk::Widget* label = Gtk::manage(preview->getPreview(UI::Widget::PREVIEW_STYLE_BLURB,
+ UI::Widget::VIEW_TYPE_LIST,
+ _baseSize, _ratio, _border));
+ Gtk::Widget* item = Gtk::manage(preview->getPreview(UI::Widget::PREVIEW_STYLE_PREVIEW,
+ UI::Widget::VIEW_TYPE_LIST,
+ _baseSize, _ratio, _border));
item->set_hexpand();
item->set_vexpand();
@@ -138,7 +142,9 @@ void PreviewHolder::addPreview( Previewable* preview )
break;
case VIEW_TYPE_GRID:
{
- Gtk::Widget* item = Gtk::manage(items[i]->getPreview(PREVIEW_STYLE_PREVIEW, VIEW_TYPE_GRID, _baseSize, _ratio, _border));
+ Gtk::Widget* item = Gtk::manage(items[i]->getPreview(UI::Widget::PREVIEW_STYLE_PREVIEW,
+ UI::Widget::VIEW_TYPE_GRID,
+ _baseSize, _ratio, _border));
int ncols = 1;
int nrows = 1;
@@ -191,7 +197,11 @@ void PreviewHolder::thawUpdates()
rebuildUI();
}
-void PreviewHolder::setStyle( ::PreviewSize size, ViewType view, guint ratio, ::BorderStyle border )
+void
+PreviewHolder::setStyle(UI::Widget::PreviewSize size,
+ UI::Widget::ViewType view,
+ guint ratio,
+ UI::Widget::BorderStyle border )
{
if ( size != _baseSize || view != _view || ratio != _ratio || border != _border ) {
_baseSize = size;
@@ -199,7 +209,7 @@ void PreviewHolder::setStyle( ::PreviewSize size, ViewType view, guint ratio, ::
_ratio = ratio;
_border = border;
// Kludge to restore scrollbars
- if ( !_wrap && (_view != VIEW_TYPE_LIST) && (_anchor == SP_ANCHOR_NORTH || _anchor == SP_ANCHOR_SOUTH) ) {
+ if ( !_wrap && (_view != UI::Widget::VIEW_TYPE_LIST) && (_anchor == SP_ANCHOR_NORTH || _anchor == SP_ANCHOR_SOUTH) ) {
_scroller->set_policy( Gtk::POLICY_AUTOMATIC, Gtk::POLICY_NEVER );
}
rebuildUI();
@@ -314,7 +324,7 @@ void PreviewHolder::calcGridSize( const Gtk::Widget* item, int itemCount, int& n
}
}
} else {
- ncols = (_baseSize == PREVIEW_SIZE_SMALL || _baseSize == PREVIEW_SIZE_TINY) ?
+ ncols = (_baseSize == UI::Widget::PREVIEW_SIZE_SMALL || _baseSize == UI::Widget::PREVIEW_SIZE_TINY) ?
COLUMNS_FOR_SMALL : COLUMNS_FOR_LARGE;
if ( _prefCols > 0 ) {
ncols = _prefCols;
@@ -335,7 +345,7 @@ void PreviewHolder::rebuildUI()
_insides->set_column_spacing(0);
_insides->set_row_spacing(0);
- if (_border == BORDER_WIDE) {
+ if (_border == UI::Widget::BORDER_WIDE) {
_insides->set_column_spacing(1);
_insides->set_row_spacing(1);
}
@@ -346,10 +356,10 @@ void PreviewHolder::rebuildUI()
_insides->set_column_spacing(8);
for ( unsigned int i = 0; i < items.size(); i++ ) {
- Gtk::Widget* label = Gtk::manage(items[i]->getPreview(PREVIEW_STYLE_BLURB, _view, _baseSize, _ratio, _border));
+ Gtk::Widget* label = Gtk::manage(items[i]->getPreview(UI::Widget::PREVIEW_STYLE_BLURB, _view, _baseSize, _ratio, _border));
//label->set_alignment(Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER);
- Gtk::Widget* item = Gtk::manage(items[i]->getPreview(PREVIEW_STYLE_PREVIEW, _view, _baseSize, _ratio, _border));
+ Gtk::Widget* item = Gtk::manage(items[i]->getPreview(UI::Widget::PREVIEW_STYLE_PREVIEW, _view, _baseSize, _ratio, _border));
item->set_hexpand();
item->set_vexpand();
@@ -372,10 +382,10 @@ void PreviewHolder::rebuildUI()
for ( unsigned int i = 0; i < items.size(); i++ ) {
// If this is the last row, flag so the previews can draw a bottom
- ::BorderStyle border = ((row == nrows -1) && (_border == BORDER_SOLID)) ?
- BORDER_SOLID_LAST_ROW : _border;
+ UI::Widget::BorderStyle border = ((row == nrows -1) && (_border == UI::Widget::BORDER_SOLID)) ?
+ UI::Widget::BORDER_SOLID_LAST_ROW : _border;
- Gtk::Widget* item = Gtk::manage(items[i]->getPreview(PREVIEW_STYLE_PREVIEW, _view, _baseSize, _ratio, border));
+ Gtk::Widget* item = Gtk::manage(items[i]->getPreview(UI::Widget::PREVIEW_STYLE_PREVIEW, _view, _baseSize, _ratio, border));
item->set_hexpand();
item->set_vexpand();
diff --git a/src/ui/previewholder.h b/src/ui/previewholder.h
index 325e9aa9f..aa1c39ab5 100644
--- a/src/ui/previewholder.h
+++ b/src/ui/previewholder.h
@@ -21,7 +21,6 @@ class Grid;
class ScrolledWindow;
}
-#include "../widgets/eek-preview.h"
#include "enums.h"
namespace Inkscape {
@@ -39,14 +38,17 @@ public:
virtual void addPreview( Previewable* preview );
virtual void freezeUpdates();
virtual void thawUpdates();
- virtual void setStyle( ::PreviewSize size, ViewType view, guint ratio, ::BorderStyle border );
+ virtual void setStyle(UI::Widget::PreviewSize size,
+ UI::Widget::ViewType view,
+ guint ratio,
+ UI::Widget::BorderStyle border);
virtual void setOrientation(SPAnchorType how);
virtual int getColumnPref() const { return _prefCols; }
virtual void setColumnPref( int cols );
- virtual ::PreviewSize getPreviewSize() const { return _baseSize; }
- virtual ViewType getPreviewType() const { return _view; }
+ virtual UI::Widget::PreviewSize getPreviewSize() const { return _baseSize; }
+ virtual UI::Widget::ViewType getPreviewType() const { return _view; }
virtual guint getPreviewRatio() const { return _ratio; }
- virtual ::BorderStyle getPreviewBorder() const { return _border; }
+ virtual UI::Widget::BorderStyle getPreviewBorder() const { return _border; }
virtual void setWrap( bool wrap );
virtual bool getWrap() const { return _wrap; }
@@ -64,11 +66,11 @@ private:
int _prefCols;
bool _updatesFrozen;
SPAnchorType _anchor;
- ::PreviewSize _baseSize;
+ UI::Widget::PreviewSize _baseSize;
guint _ratio;
- ViewType _view;
+ UI::Widget::ViewType _view;
bool _wrap;
- ::BorderStyle _border;
+ UI::Widget::BorderStyle _border;
};
} //namespace UI
diff --git a/src/ui/widget/panel.cpp b/src/ui/widget/panel.cpp
index d6e170c74..8ca08a091 100644
--- a/src/ui/widget/panel.cpp
+++ b/src/ui/widget/panel.cpp
@@ -20,7 +20,7 @@
#include "desktop.h"
#include "inkscape.h"
-#include "widgets/eek-preview.h"
+#include "preview.h"
namespace Inkscape {
namespace UI {
@@ -35,7 +35,7 @@ void Panel::prep() {
GTK_ICON_SIZE_DND, // Not used by options, but included to make the last size larger
GTK_ICON_SIZE_DIALOG
};
- EekPreview::set_size_mappings( G_N_ELEMENTS(sizes), sizes );
+ Preview::set_size_mappings( G_N_ELEMENTS(sizes), sizes );
}
Panel::Panel(gchar const *prefs_path, int verb_num) :
diff --git a/src/widgets/eek-preview.cpp b/src/ui/widget/preview.cpp
index 362c17977..f22032b65 100644
--- a/src/widgets/eek-preview.cpp
+++ b/src/ui/widget/preview.cpp
@@ -39,9 +39,13 @@
using std::min;
#include <gdkmm/general.h>
-#include "eek-preview.h"
+#include "preview.h"
#include "preferences.h"
+namespace Inkscape {
+namespace UI {
+namespace Widget {
+
#define PRIME_BUTTON_MAGIC_NUMBER 1
/* Keep in sync with last value in eek-preview.h */
@@ -51,7 +55,7 @@ using std::min;
#define PREVIEW_MAX_RATIO 500
void
-EekPreview::set_color(int r, int g, int b )
+Preview::set_color(int r, int g, int b )
{
_r = r;
_g = g;
@@ -62,7 +66,7 @@ EekPreview::set_color(int r, int g, int b )
void
-EekPreview::set_pixbuf(const Glib::RefPtr<Gdk::Pixbuf> &pixbuf)
+Preview::set_pixbuf(const Glib::RefPtr<Gdk::Pixbuf> &pixbuf)
{
_previewPixbuf = pixbuf;
@@ -81,7 +85,7 @@ static gboolean setupDone = FALSE;
static GtkRequisition sizeThings[PREVIEW_SIZE_NEXTFREE];
void
-EekPreview::set_size_mappings( guint count, GtkIconSize const* sizes )
+Preview::set_size_mappings( guint count, GtkIconSize const* sizes )
{
gint width = 0;
gint height = 0;
@@ -116,7 +120,7 @@ EekPreview::set_size_mappings( guint count, GtkIconSize const* sizes )
}
void
-EekPreview::size_request(GtkRequisition* req) const
+Preview::size_request(GtkRequisition* req) const
{
int width = 0;
int height = 0;
@@ -151,7 +155,7 @@ EekPreview::size_request(GtkRequisition* req) const
}
void
-EekPreview::get_preferred_width_vfunc(int &minimal_width, int &natural_width) const
+Preview::get_preferred_width_vfunc(int &minimal_width, int &natural_width) const
{
GtkRequisition requisition;
size_request(&requisition);
@@ -159,7 +163,7 @@ EekPreview::get_preferred_width_vfunc(int &minimal_width, int &natural_width) co
}
void
-EekPreview::get_preferred_height_vfunc(int &minimal_height, int &natural_height) const
+Preview::get_preferred_height_vfunc(int &minimal_height, int &natural_height) const
{
GtkRequisition requisition;
size_request(&requisition);
@@ -167,7 +171,7 @@ EekPreview::get_preferred_height_vfunc(int &minimal_height, int &natural_height)
}
bool
-EekPreview::on_draw(const Cairo::RefPtr<Cairo::Context> &cr)
+Preview::on_draw(const Cairo::RefPtr<Cairo::Context> &cr)
{
auto allocation = get_allocation();
@@ -343,7 +347,7 @@ EekPreview::on_draw(const Cairo::RefPtr<Cairo::Context> &cr)
bool
-EekPreview::on_enter_notify_event(GdkEventCrossing* event )
+Preview::on_enter_notify_event(GdkEventCrossing* event )
{
_within = true;
set_state_flags(_hot ? Gtk::STATE_FLAG_ACTIVE : Gtk::STATE_FLAG_PRELIGHT, false);
@@ -352,7 +356,7 @@ EekPreview::on_enter_notify_event(GdkEventCrossing* event )
}
bool
-EekPreview::on_leave_notify_event(GdkEventCrossing* event)
+Preview::on_leave_notify_event(GdkEventCrossing* event)
{
_within = false;
set_state_flags(Gtk::STATE_FLAG_NORMAL, false);
@@ -361,7 +365,7 @@ EekPreview::on_leave_notify_event(GdkEventCrossing* event)
}
bool
-EekPreview::on_button_press_event(GdkEventButton *event)
+Preview::on_button_press_event(GdkEventButton *event)
{
if (_takesFocus && !has_focus() )
{
@@ -383,7 +387,7 @@ EekPreview::on_button_press_event(GdkEventButton *event)
}
bool
-EekPreview::on_button_release_event(GdkEventButton* event)
+Preview::on_button_release_event(GdkEventButton* event)
{
_hot = false;
set_state_flags(Gtk::STATE_FLAG_NORMAL, false);
@@ -409,7 +413,7 @@ EekPreview::on_button_release_event(GdkEventButton* event)
}
void
-EekPreview::set_linked(LinkType link)
+Preview::set_linked(LinkType link)
{
link = (LinkType)(link & PREVIEW_LINK_ALL);
@@ -422,16 +426,16 @@ EekPreview::set_linked(LinkType link)
}
LinkType
-EekPreview::get_linked() const
+Preview::get_linked() const
{
return (LinkType)_linked;
}
void
-EekPreview::set_details(ViewType view,
- PreviewSize size,
- guint ratio,
- guint border)
+Preview::set_details(ViewType view,
+ PreviewSize size,
+ guint ratio,
+ guint border)
{
_view = view;
@@ -453,7 +457,7 @@ EekPreview::set_details(ViewType view,
queue_draw();
}
-EekPreview::EekPreview()
+Preview::Preview()
: _r(0x80),
_g(0x80),
_b(0xcc),
@@ -483,6 +487,10 @@ EekPreview::EekPreview()
|Gdk::LEAVE_NOTIFY_MASK );
}
+} // namespace Widget
+} // namespace UI
+} // namespace Inkscape
+
/*
Local Variables:
mode:c++
diff --git a/src/widgets/eek-preview.h b/src/ui/widget/preview.h
index d01164b35..b455367a9 100644
--- a/src/widgets/eek-preview.h
+++ b/src/ui/widget/preview.h
@@ -45,6 +45,10 @@
* Generic implementation of an object that can be shown by a preview.
*/
+namespace Inkscape {
+namespace UI {
+namespace Widget {
+
enum PreviewStyle {
PREVIEW_STYLE_ICON = 0,
PREVIEW_STYLE_PREVIEW,
@@ -87,7 +91,7 @@ enum BorderStyle {
BORDER_SOLID_LAST_ROW,
};
-class EekPreview : public Gtk::DrawingArea {
+class Preview : public Gtk::DrawingArea {
private:
int _scaledW;
int _scaledH;
@@ -124,7 +128,7 @@ protected:
bool on_leave_notify_event(GdkEventCrossing* event ) override;
public:
- EekPreview();
+ Preview();
bool get_focus_on_click() const {return _takesFocus;}
void set_focus_on_click(bool focus_on_click) {_takesFocus = focus_on_click;}
LinkType get_linked() const;
@@ -141,6 +145,9 @@ public:
decltype(_signal_alt_clicked) signal_alt_clicked() {return _signal_alt_clicked;}
};
+} // namespace Widget
+} // namespace UI
+} // namespace Inkscape
#endif /* SEEN_EEK_PREVIEW_H */
diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt
index 1180ed736..5a3b101e5 100644
--- a/src/widgets/CMakeLists.txt
+++ b/src/widgets/CMakeLists.txt
@@ -3,7 +3,6 @@ add_subdirectory(gimp)
set(widgets_SRC
desktop-widget.cpp
- eek-preview.cpp
ege-adjustment-action.cpp
ege-output-action.cpp
ege-paint-def.cpp
@@ -31,7 +30,6 @@ set(widgets_SRC
# -------
# Headers
desktop-widget.h
- eek-preview.h
ege-adjustment-action.h
ege-output-action.h
ege-paint-def.h
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-10 21:00:47 +0000