Merge branch 'master' of ssh://git.ring0.de/var/git/pdf-presenter
commit
b427b77ed7
|
@ -49,8 +49,8 @@ class ConfigWindow : Dialog {
|
|||
|
||||
// FIXME: add keybindings
|
||||
|
||||
add_button(STOCK_OK, ResponseType.OK);
|
||||
add_button(STOCK_CANCEL, ResponseType.CANCEL);
|
||||
add_button(Stock.OK, ResponseType.OK);
|
||||
add_button(Stock.CANCEL, ResponseType.CANCEL);
|
||||
|
||||
response.connect(response_handler);
|
||||
show_all();
|
||||
|
|
|
@ -48,11 +48,11 @@ class ControlToolbar : Toolbar {
|
|||
pages = n_pages;
|
||||
|
||||
/* Init Toolbar Elements */
|
||||
prev = new ToolButton.from_stock(STOCK_GO_BACK);
|
||||
prev = new ToolButton.from_stock(Stock.GO_BACK);
|
||||
entry = new Entry();
|
||||
entry.set_width_chars(3);
|
||||
next = new ToolButton.from_stock(STOCK_GO_FORWARD);
|
||||
config = new ToolButton.from_stock(STOCK_PREFERENCES);
|
||||
next = new ToolButton.from_stock(Stock.GO_FORWARD);
|
||||
config = new ToolButton.from_stock(Stock.PREFERENCES);
|
||||
curr_time = new Label("Time");
|
||||
pres_time = new Label("Duration");
|
||||
pres_time.set_markup("<b>Duration</b>");
|
||||
|
|
|
@ -71,7 +71,7 @@ class ControlView : DrawingArea {
|
|||
height = (int) height2;
|
||||
|
||||
Gtk.Allocation rect = Gtk.Allocation();
|
||||
get_allocation(rect);
|
||||
get_allocation(out rect);
|
||||
window_w = rect.width;
|
||||
window_h = rect.height;
|
||||
|
||||
|
@ -99,7 +99,7 @@ class ControlView : DrawingArea {
|
|||
int w,h;
|
||||
|
||||
Gtk.Allocation rect = Gtk.Allocation();
|
||||
get_allocation(rect);
|
||||
get_allocation(out rect);
|
||||
w = rect.width;
|
||||
h = rect.height;
|
||||
|
||||
|
|
|
@ -28,14 +28,14 @@ class ErrorDialog : Dialog {
|
|||
public ErrorDialog(string title, string message) {
|
||||
var label = new Label(message);
|
||||
var hbox = new HBox(false, 0);
|
||||
var img = new Image.from_stock(STOCK_DIALOG_ERROR, IconSize.DIALOG);
|
||||
var img = new Image.from_stock(Stock.DIALOG_ERROR, IconSize.DIALOG);
|
||||
hbox.pack_start(img, false, true, 10);
|
||||
hbox.pack_start(label, false, true, 10);
|
||||
|
||||
this.set_icon_name("gtk-dialog-error");
|
||||
this.title = title;
|
||||
this.vbox.pack_start(hbox, false, true, 10);
|
||||
this.add_button (STOCK_CLOSE, ResponseType.CLOSE);
|
||||
this.add_button (Stock.CLOSE, ResponseType.CLOSE);
|
||||
this.destroy.connect(Gtk.main_quit);
|
||||
this.response.connect(Gtk.main_quit);
|
||||
this.show_all();
|
||||
|
|
Loading…
Reference in New Issue