Commit d28bea61 authored by Dmitry Kazakov's avatar Dmitry Kazakov

Rename onion skins dialog into a docker

parent b0dd4778
......@@ -4,7 +4,7 @@ set(KRITA_ANIMATIONDOCKER_PART_SRCS
animation_dockers.cpp
animation_docker.cpp
timeline_docker.cpp
kis_onion_skin_dialog.cpp
onion_skins_docker.cpp
timeline_layers_header.cpp
timeline_ruler_header.cpp
......@@ -30,7 +30,7 @@ set(KRITA_ANIMATIONDOCKER_PART_SRCS
ki18n_wrap_ui(KRITA_ANIMATIONDOCKER_PART_SRCS
wdg_animation.ui
kis_onion_skin_dialog.ui
onion_skins_docker.ui
)
add_library(kritaanimationdocker MODULE ${KRITA_ANIMATIONDOCKER_PART_SRCS})
......
......@@ -19,7 +19,7 @@
#include "animation_dockers.h"
#include "animation_docker.h"
#include "timeline_docker.h"
#include "kis_onion_skin_dialog.h"
#include "onion_skins_docker.h"
#include <kpluginfactory.h>
......@@ -110,7 +110,7 @@ public:
virtual QDockWidget *createDockWidget()
{
KisOnionSkinDialog *dockWidget = new KisOnionSkinDialog();
OnionSkinsDocker *dockWidget = new OnionSkinsDocker();
dockWidget->setObjectName(id());
return dockWidget;
......
......@@ -16,8 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "kis_onion_skin_dialog.h"
#include "ui_kis_onion_skin_dialog.h"
#include "onion_skins_docker.h"
#include "ui_onion_skins_docker.h"
#include <QSlider>
#include <QFrame>
......@@ -33,9 +33,9 @@
static const int MAX_SKIN_COUNT = 10;
KisOnionSkinDialog::KisOnionSkinDialog(QWidget *parent) :
OnionSkinsDocker::OnionSkinsDocker(QWidget *parent) :
QDockWidget(i18n("Onion Skins"), parent),
ui(new Ui::KisOnionSkinDialog),
ui(new Ui::OnionSkinsDocker),
m_updatesCompressor(300, KisSignalCompressor::FIRST_ACTIVE)
{
QWidget* mainWidget = new QWidget(this);
......@@ -80,26 +80,26 @@ KisOnionSkinDialog::KisOnionSkinDialog(QWidget *parent) :
resize(sizeHint());
}
KisOnionSkinDialog::~KisOnionSkinDialog()
OnionSkinsDocker::~OnionSkinsDocker()
{
delete ui;
}
void KisOnionSkinDialog::setCanvas(KoCanvasBase *canvas)
void OnionSkinsDocker::setCanvas(KoCanvasBase *canvas)
{
Q_UNUSED(canvas);
}
void KisOnionSkinDialog::unsetCanvas()
void OnionSkinsDocker::unsetCanvas()
{
}
void KisOnionSkinDialog::setMainWindow(KisViewManager *kisview)
void OnionSkinsDocker::setMainWindow(KisViewManager *kisview)
{
Q_UNUSED(kisview);
}
void KisOnionSkinDialog::slotShowAdditionalSettings(bool value)
void OnionSkinsDocker::slotShowAdditionalSettings(bool value)
{
ui->lblPrevColor->setVisible(value);
ui->lblNextColor->setVisible(value);
......@@ -117,7 +117,7 @@ void KisOnionSkinDialog::slotShowAdditionalSettings(bool value)
config.setShowAdditionalOnionSkinsSettings(value);
}
void KisOnionSkinDialog::changed()
void OnionSkinsDocker::changed()
{
KisImageConfig config;
......@@ -136,7 +136,7 @@ void KisOnionSkinDialog::changed()
KisOnionSkinCompositor::instance()->configChanged();
}
void KisOnionSkinDialog::loadSettings()
void OnionSkinsDocker::loadSettings()
{
KisImageConfig config;
......
......@@ -16,8 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef KIS_ONION_SKIN_DIALOG_H
#define KIS_ONION_SKIN_DIALOG_H
#ifndef ONION_SKINS_DOCKER_H
#define ONION_SKINS_DOCKER_H
#include <QDockWidget>
......@@ -25,18 +25,18 @@
#include "kis_signal_compressor.h"
namespace Ui {
class KisOnionSkinDialog;
class OnionSkinsDocker;
}
class KisEqualizerWidget;
class KisOnionSkinDialog : public QDockWidget, public KisMainwindowObserver
class OnionSkinsDocker : public QDockWidget, public KisMainwindowObserver
{
Q_OBJECT
public:
explicit KisOnionSkinDialog(QWidget *parent = 0);
~KisOnionSkinDialog();
explicit OnionSkinsDocker(QWidget *parent = 0);
~OnionSkinsDocker();
QString observerName() { return "OnionSkinsDocker"; }
virtual void setCanvas(KoCanvasBase *canvas);
......@@ -44,7 +44,7 @@ public:
void setMainWindow(KisViewManager *kisview);
private:
Ui::KisOnionSkinDialog *ui;
Ui::OnionSkinsDocker *ui;
KisSignalCompressor m_updatesCompressor;
KisEqualizerWidget *m_equalizerWidget;
......@@ -57,4 +57,4 @@ private Q_SLOTS:
void slotShowAdditionalSettings(bool value);
};
#endif // KIS_ONION_SKIN_DIALOG_H
#endif // ONION_SKINS_DOCKER_H
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>KisOnionSkinDialog</class>
<widget class="QWidget" name="KisOnionSkinDialog">
<class>OnionSkinsDocker</class>
<widget class="QWidget" name="OnionSkinsDocker">
<property name="geometry">
<rect>
<x>0</x>
......
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