[cheese/three-point-oh] Added About Dialog box
- From: Yuvaraj Pandian <yuvipanda src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cheese/three-point-oh] Added About Dialog box
- Date: Sat, 29 May 2010 19:19:11 +0000 (UTC)
commit ec623171f8809e52bc23fc4b207415a93bef7ee8
Author: Yuvaraj Pandian T <yuvipanda gmail com>
Date: Sun May 30 00:49:03 2010 +0530
Added About Dialog box
data/cheese.ui | 69 +++++++++++++++++++++++++++++++++++++++++++-
valasrc/cheese-window.vala | 16 ++++++++--
2 files changed, 81 insertions(+), 4 deletions(-)
---
diff --git a/data/cheese.ui b/data/cheese.ui
index 1142f72..befb974 100644
--- a/data/cheese.ui
+++ b/data/cheese.ui
@@ -1,6 +1,61 @@
<?xml version="1.0"?>
<interface>
<requires lib="gtk+" version="2.16" />
+ <object class="GtkAboutDialog" id="aboutdialog">
+ <property name="program_name">Cheese</property>
+ <property name="comments">Take photos and videos with your webcam, with fun graphical effects</property>
+ <property name="copyright">Copyright © 2007 - 2009
+daniel g. siegel <dgsiegel gnome org></property>
+ <property name="website">http://projects.gnome.org/cheese</property>
+ <property name="website-label">Cheese Website</property>
+ <property name="wrap-license">True</property>
+ <property name="logo-icon-name">cheese</property>
+ <property name="translator-credits" translatable="true">translator-credits</property>
+ <property name="license" translatable="true">This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
+</property>
+ <property name="authors">daniel g. siegel <dgsiegel gnome org>
+Jaap A. Haitsma <jaap haitsma org>
+Filippo Argiolas <fargiolas gnome org>
+
+Aidan Delaney <a j delaney brighton ac uk>
+Alex "weej" Jones <alex weej com>
+Andrea Cimitan <andrea cimitan gmail com>
+Baptiste Mille-Mathias <bmm80 free fr>
+Cosimo Cecchi <anarki lilik it>
+Diego Escalante Urrelo <dieguito gmail com>
+Felix Kaser <f kaser gmx net>
+Gintautas Miliauskas <gintas akl lt>
+Hans de Goede <jwrdegoede fedoraproject org>
+James Liggett <jrliggett cox net>
+Luca Ferretti <elle uca libero it>
+Mirco "MacSlow" Müller <macslow bangang de>
+Patryk Zawadzki <patrys pld-linux org>
+Ryan Zeigler <zeiglerr gmail com>
+Sebastian Keller <sebastian-keller gmx de>
+Steve Magoun <steve magoun canonical com>
+Thomas Perl <thp thpinfo com>
+Tim Philipp Müller <tim centricular net>
+Todd Eisenberger <teisenberger gmail com>
+Tommi Vainikainen <thv iki fi>
+ </property>
+ <property name="documenters">Joshua Henderson <joshhendo gmail com>
+Jaap A. Haitsma <jaap haitsma org>
+Felix Kaser <f kaser gmx net>
+ </property>
+ <property name="artists">Andreas Nilsson <andreas andreasn se>
+Josef VybÃral <josef vybiral gmail com>
+Kalle Persson <kalle kallepersson se>
+Lapo Calamandrei <calamandrei gmail com>
+Or Dvory <gnudles nana co il>
+Ulisse Perusin <ulisail yahoo it>
+ </property>
+
+ </object>
+
<object class="GtkUIManager" id="menu_ui_man">
<child>
<object class="GtkActionGroup" id="main_actions">
@@ -53,7 +108,7 @@
<property name="name">About</property>
<property name="label">_About</property>
<property name="stock_id">gtk-about</property>
- <signal name="activate" handler="cheese_main_window_on_about" />
+ <signal name="activate" handler="cheese_main_window_on_help_about" />
</object>
</child>
@@ -299,6 +354,18 @@
<property name="fill">True</property>
</packing>
</child>
+
+ <child>
+ <object class="GtkHBox" id="action_buttons_area">
+ <child>
+
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
</object>
</child>
<child>
diff --git a/valasrc/cheese-window.vala b/valasrc/cheese-window.vala
index ecb7f42..96d492e 100644
--- a/valasrc/cheese-window.vala
+++ b/valasrc/cheese-window.vala
@@ -1,14 +1,16 @@
-
using Gtk;
using Gdk;
using GtkClutter;
using Clutter;
+using Config;
const int DEFAULT_WINDOW_WIDTH = 600;
const int DEFAULT_WINDOW_HEIGHT = 450;
public class Cheese.MainWindow : Gtk.Window {
+ private Gtk.Builder builder;
+
private Widget thumbnails;
private GtkClutter.Embed viewport_widget;
private Clutter.Stage viewport;
@@ -17,7 +19,6 @@ public class Cheese.MainWindow : Gtk.Window {
destroy();
}
-
[CCode (instance_pos = -1)]
internal void on_help_contents (Action action ) {
Gdk.Screen screen;
@@ -25,9 +26,18 @@ public class Cheese.MainWindow : Gtk.Window {
Gtk.show_uri(screen, "ghelp:cheese", Gtk.get_current_event_time());
}
+ [CCode (instance_pos = -1)]
+ internal void on_help_about (Action action) {
+ // FIXME: Close doesn't work
+ // FIXME: Clicking URL In the License dialog borks.
+ Gtk.AboutDialog about_dialog;
+ about_dialog = (Gtk.AboutDialog) builder.get_object("aboutdialog");
+ about_dialog.version = Config.VERSION;
+ about_dialog.show_all();
+ }
public void setup_ui () {
- Builder builder = new Builder();
+ builder = new Builder();
VBox main_vbox;
builder.add_from_file (GLib.Path.build_filename ("../data/", "cheese.ui"));
builder.connect_signals(this);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]