[gtkmm-documentation] Use ColorChooserDialog instead of deprecated ColorSelectionDialog.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm-documentation] Use ColorChooserDialog instead of deprecated ColorSelectionDialog.
- Date: Fri, 2 Mar 2012 20:18:29 +0000 (UTC)
commit 9d7bf4080d55b727267099ed2c8b58e6bda254d5
Author: Murray Cumming <murrayc murrayc com>
Date: Fri Mar 2 21:17:43 2012 +0100
Use ColorChooserDialog instead of deprecated ColorSelectionDialog.
* docs/tutorial/Makefile.am:
* docs/tutorial/C/figures/dialogs_colorselectiondialog.png: Move to
* docs/tutorial/C/figures/dialogs_colorchooserdialog.png: though we
still need to actually update the image.
* examples/Makefile.am:
* examples/book/dialogs/colorselectiondialog/: Move to:
* examples/book/dialogs/colorchooserdialog/: And change the code
appropriately.
ChangeLog | 13 +++++++++++++
...ondialog.png => dialogs_colorchooserdialog.png} | Bin 29842 -> 29842 bytes
docs/tutorial/C/gtkmm-tutorial-in.xml | 16 ++++++++--------
docs/tutorial/Makefile.am | 2 +-
examples/Makefile.am | 10 +++++-----
.../examplewindow.cc | 10 +++++-----
.../examplewindow.h | 0
.../main.cc | 0
8 files changed, 32 insertions(+), 19 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index dfb13f1..fcea0a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2012-03-02 Murray Cumming <murrayc murrayc com>
+
+ Use ColorChooserDialog instead of deprecated ColorSelectionDialog.
+
+ * docs/tutorial/Makefile.am:
+ * docs/tutorial/C/figures/dialogs_colorselectiondialog.png: Move to
+ * docs/tutorial/C/figures/dialogs_colorchooserdialog.png: though we
+ still need to actually update the image.
+ * examples/Makefile.am:
+ * examples/book/dialogs/colorselectiondialog/: Move to:
+ * examples/book/dialogs/colorchooserdialog/: And change the code
+ appropriately.
+
2012-02-29 Murray Cumming <murrayc murrayc com>
Use Gtk::ApplicationWindow.
diff --git a/docs/tutorial/C/figures/dialogs_colorselectiondialog.png b/docs/tutorial/C/figures/dialogs_colorchooserdialog.png
similarity index 100%
rename from docs/tutorial/C/figures/dialogs_colorselectiondialog.png
rename to docs/tutorial/C/figures/dialogs_colorchooserdialog.png
diff --git a/docs/tutorial/C/gtkmm-tutorial-in.xml b/docs/tutorial/C/gtkmm-tutorial-in.xml
index bf962e1..c6fd478 100644
--- a/docs/tutorial/C/gtkmm-tutorial-in.xml
+++ b/docs/tutorial/C/gtkmm-tutorial-in.xml
@@ -3903,26 +3903,26 @@ Most of the useful member methods for this class are actually in the
</sect2>
</sect1>
-<sect1 id="sec-color-selection-dialog"><title>ColorSelectionDialog</title>
+<sect1 id="sec-color-selection-dialog"><title>ColorChooserDialog</title>
<para>
-The <classname>ColorSelectionDialog</classname> allows the user to choose a
+The <classname>ColorChooserDialog</classname> allows the user to choose a
color. The <classname>ColorButton</classname> opens a color selection dialog
when it is clicked.
</para>
-<para><ulink url="&url_refdocs_base_gtk;ColorSelectionDialog.html">Reference</ulink></para>
+<para><ulink url="&url_refdocs_base_gtk;ColorChooserDialog.html">Reference</ulink></para>
-<sect2 id="colorselectiondialog-example">
+<sect2 id="colorchooserdialog-example">
<title>Example</title>
-<figure id="figure-dialogs-colorselectiondialog">
- <title>ColorSelectionDialog</title>
+<figure id="figure-dialogs-colorchooserdialog">
+ <title>ColorChooserDialog</title>
<screenshot>
- <graphic format="PNG" fileref="&url_figures_base;dialogs_colorselectiondialog.png"/>
+ <graphic format="PNG" fileref="&url_figures_base;dialogs_colorchooserdialog.png"/>
</screenshot>
</figure>
-<para><ulink url="&url_examples_base;dialogs/colorselectiondialog">Source Code</ulink></para>
+<para><ulink url="&url_examples_base;dialogs/colorchooserdialog">Source Code</ulink></para>
</sect2>
</sect1>
diff --git a/docs/tutorial/Makefile.am b/docs/tutorial/Makefile.am
index 19395c8..895f23f 100644
--- a/docs/tutorial/Makefile.am
+++ b/docs/tutorial/Makefile.am
@@ -40,7 +40,7 @@ DOC_FIGURES = \
figures/comboboxentry_text.png \
figures/custom_container.png \
figures/dialogs_about.png \
- figures/dialogs_colorselectiondialog.png\
+ figures/dialogs_colorchooserdialog.png\
figures/dialogs_filechooser.png \
figures/dialogs_fontchooserdialog.png \
figures/dialogs_messagedialog.png \
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 148a82f..f556144 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -31,7 +31,7 @@ check_PROGRAMS = \
book/custom/custom_container/example \
book/custom/custom_widget/example \
book/dialogs/aboutdialog/example \
- book/dialogs/colorselectiondialog/example \
+ book/dialogs/colorchooserdialog/example \
book/dialogs/filechooserdialog/example \
book/dialogs/fontchooserdialog/example \
book/dialogs/messagedialog/example \
@@ -266,10 +266,10 @@ book_dialogs_aboutdialog_example_SOURCES = \
book/dialogs/aboutdialog/examplewindow.h \
book/dialogs/aboutdialog/main.cc
-book_dialogs_colorselectiondialog_example_SOURCES = \
- book/dialogs/colorselectiondialog/examplewindow.cc \
- book/dialogs/colorselectiondialog/examplewindow.h \
- book/dialogs/colorselectiondialog/main.cc
+book_dialogs_colorchooserdialog_example_SOURCES = \
+ book/dialogs/colorchooserdialog/examplewindow.cc \
+ book/dialogs/colorchooserdialog/examplewindow.h \
+ book/dialogs/colorchooserdialog/main.cc
book_dialogs_filechooserdialog_example_SOURCES = \
book/dialogs/filechooserdialog/examplewindow.cc \
diff --git a/examples/book/dialogs/colorselectiondialog/examplewindow.cc b/examples/book/dialogs/colorchooserdialog/examplewindow.cc
similarity index 90%
rename from examples/book/dialogs/colorselectiondialog/examplewindow.cc
rename to examples/book/dialogs/colorchooserdialog/examplewindow.cc
index 3b851b7..9dd68ae 100644
--- a/examples/book/dialogs/colorselectiondialog/examplewindow.cc
+++ b/examples/book/dialogs/colorchooserdialog/examplewindow.cc
@@ -23,7 +23,7 @@ ExampleWindow::ExampleWindow()
: m_VBox(Gtk::ORIENTATION_VERTICAL, 5),
m_Button_Dialog("Choose Color")
{
- set_title("Gtk::ColorSelectionDialog example");
+ set_title("Gtk::ColorChooserDialog example");
set_default_size(200, 200);
add(m_VBox);
@@ -63,13 +63,13 @@ void ExampleWindow::on_color_button_color_set()
void ExampleWindow::on_button_dialog_clicked()
{
- Gtk::ColorSelectionDialog dialog("Please choose a color");
+ Gtk::ColorChooserDialog dialog("Please choose a color");
dialog.set_transient_for(*this);
//Get the previously selected color:
- dialog.get_color_selection()->set_current_rgba(m_Color);
+ dialog.set_rgba(m_Color);
- int result = dialog.run();
+ const int result = dialog.run();
//Handle the response:
switch(result)
@@ -77,7 +77,7 @@ void ExampleWindow::on_button_dialog_clicked()
case Gtk::RESPONSE_OK:
{
//Store the chosen color, and show it:
- m_Color = dialog.get_color_selection()->get_current_rgba();
+ m_Color = dialog.get_rgba();
m_ColorButton.set_rgba(m_Color);
m_DrawingArea.override_background_color(m_Color);
break;
diff --git a/examples/book/dialogs/colorselectiondialog/examplewindow.h b/examples/book/dialogs/colorchooserdialog/examplewindow.h
similarity index 100%
rename from examples/book/dialogs/colorselectiondialog/examplewindow.h
rename to examples/book/dialogs/colorchooserdialog/examplewindow.h
diff --git a/examples/book/dialogs/colorselectiondialog/main.cc b/examples/book/dialogs/colorchooserdialog/main.cc
similarity index 100%
rename from examples/book/dialogs/colorselectiondialog/main.cc
rename to examples/book/dialogs/colorchooserdialog/main.cc
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]