/[svn]/gigedit/trunk/src/gigedit/mainwindow.cpp
ViewVC logotype

Diff of /gigedit/trunk/src/gigedit/mainwindow.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2246 by persson, Fri Aug 19 10:55:41 2011 UTC revision 2344 by persson, Sun Apr 29 16:15:45 2012 UTC
# Line 1  Line 1 
1  /*  /*
2   * Copyright (C) 2006-2011 Andreas Persson   * Copyright (C) 2006-2012 Andreas Persson
3   *   *
4   * This program is free software; you can redistribute it and/or   * This program is free software; you can redistribute it and/or
5   * modify it under the terms of the GNU General Public License as   * modify it under the terms of the GNU General Public License as
# Line 20  Line 20 
20  #include <iostream>  #include <iostream>
21  #include <cstring>  #include <cstring>
22    
23    #include <glibmm/convert.h>
24    #include <glibmm/dispatcher.h>
25    #include <glibmm/miscutils.h>
26    #include <glibmm/stringutils.h>
27  #include <gtkmm/aboutdialog.h>  #include <gtkmm/aboutdialog.h>
28  #include <gtkmm/filechooserdialog.h>  #include <gtkmm/filechooserdialog.h>
29  #include <gtkmm/messagedialog.h>  #include <gtkmm/messagedialog.h>
# Line 28  Line 32 
32  #include <gtkmm/main.h>  #include <gtkmm/main.h>
33  #include <gtkmm/radiomenuitem.h>  #include <gtkmm/radiomenuitem.h>
34  #include <gtkmm/toggleaction.h>  #include <gtkmm/toggleaction.h>
35    #if GTKMM_MAJOR_VERSION < 3
36  #include "wrapLabel.hh"  #include "wrapLabel.hh"
37    #endif
38    
39  #include "global.h"  #include "global.h"
40  #include "compat.h"  #include "compat.h"
# Line 461  void loader_progress_callback(gig::progr Line 467  void loader_progress_callback(gig::progr
467  void Loader::progress_callback(float fraction)  void Loader::progress_callback(float fraction)
468  {  {
469      {      {
470          Glib::Mutex::Lock lock(progressMutex);          Glib::Threads::Mutex::Lock lock(progressMutex);
471          progress = fraction;          progress = fraction;
472      }      }
473      progress_dispatcher();      progress_dispatcher();
# Line 469  void Loader::progress_callback(float fra Line 475  void Loader::progress_callback(float fra
475    
476  void Loader::thread_function()  void Loader::thread_function()
477  {  {
478      printf("thread_function self=%x\n", Glib::Thread::self());      printf("thread_function self=%x\n", Glib::Threads::Thread::self());
479      printf("Start %s\n", filename);      printf("Start %s\n", filename);
480      RIFF::File* riff = new RIFF::File(filename);      RIFF::File* riff = new RIFF::File(filename);
481      gig = new gig::File(riff);      gig = new gig::File(riff);
# Line 489  Loader::Loader(const char* filename) Line 495  Loader::Loader(const char* filename)
495    
496  void Loader::launch()  void Loader::launch()
497  {  {
498    #ifdef OLD_THREADS
499      thread = Glib::Thread::create(sigc::mem_fun(*this, &Loader::thread_function), true);      thread = Glib::Thread::create(sigc::mem_fun(*this, &Loader::thread_function), true);
500    #else
501        thread = Glib::Threads::Thread::create(sigc::mem_fun(*this, &Loader::thread_function));
502    #endif
503      printf("launch thread=%x\n", thread);      printf("launch thread=%x\n", thread);
504  }  }
505    
# Line 497  float Loader::get_progress() Line 507  float Loader::get_progress()
507  {  {
508      float res;      float res;
509      {      {
510          Glib::Mutex::Lock lock(progressMutex);          Glib::Threads::Mutex::Lock lock(progressMutex);
511          res = progress;          res = progress;
512      }      }
513      return res;      return res;
# Line 617  void MainWindow::on_action_file_open() Line 627  void MainWindow::on_action_file_open()
627      if (dialog.run() == Gtk::RESPONSE_OK) {      if (dialog.run() == Gtk::RESPONSE_OK) {
628          std::string filename = dialog.get_filename();          std::string filename = dialog.get_filename();
629          printf("filename=%s\n", filename.c_str());          printf("filename=%s\n", filename.c_str());
630          printf("on_action_file_open self=%x\n", Glib::Thread::self());          printf("on_action_file_open self=%x\n", Glib::Threads::Thread::self());
631          load_file(filename.c_str());          load_file(filename.c_str());
632          current_gig_dir = Glib::path_get_dirname(filename);          current_gig_dir = Glib::path_get_dirname(filename);
633      }      }
# Line 659  void MainWindow::on_loader_progress() Line 669  void MainWindow::on_loader_progress()
669  void MainWindow::on_loader_finished()  void MainWindow::on_loader_finished()
670  {  {
671      printf("Loader finished!\n");      printf("Loader finished!\n");
672      printf("on_loader_finished self=%x\n", Glib::Thread::self());      printf("on_loader_finished self=%x\n", Glib::Threads::Thread::self());
673      load_gig(loader->gig, loader->filename);      load_gig(loader->gig, loader->filename);
674      load_dialog->hide();      load_dialog->hide();
675  }  }
# Line 762  bool MainWindow::file_save_as() Line 772  bool MainWindow::file_save_as()
772      descriptionArea.set_spacing(15);      descriptionArea.set_spacing(15);
773      Gtk::Image warningIcon(Gtk::Stock::DIALOG_WARNING, Gtk::IconSize(Gtk::ICON_SIZE_DIALOG));      Gtk::Image warningIcon(Gtk::Stock::DIALOG_WARNING, Gtk::IconSize(Gtk::ICON_SIZE_DIALOG));
774      descriptionArea.pack_start(warningIcon, Gtk::PACK_SHRINK);      descriptionArea.pack_start(warningIcon, Gtk::PACK_SHRINK);
775    #if GTKMM_MAJOR_VERSION < 3
776      view::WrapLabel description;      view::WrapLabel description;
777    #else
778        Gtk::Label description;
779        description.set_line_wrap();
780    #endif
781      description.set_markup(      description.set_markup(
782          _("\n<b>CAUTION:</b> You <b>MUST</b> use the "          _("\n<b>CAUTION:</b> You <b>MUST</b> use the "
783            "<span style=\"italic\">\"Save\"</span> dialog instead of "            "<span style=\"italic\">\"Save\"</span> dialog instead of "
# Line 911  void MainWindow::on_action_help_about() Line 926  void MainWindow::on_action_help_about()
926      dialog.set_name("Gigedit");      dialog.set_name("Gigedit");
927  #endif  #endif
928      dialog.set_version(VERSION);      dialog.set_version(VERSION);
929      dialog.set_copyright("Copyright (C) 2006-2011 Andreas Persson");      dialog.set_copyright("Copyright (C) 2006-2012 Andreas Persson");
930      dialog.set_comments(_(      dialog.set_comments(_(
931          "Released under the GNU General Public License.\n"          "Released under the GNU General Public License.\n"
932          "\n"          "\n"
# Line 1549  void MainWindow::on_action_replace_all_s Line 1564  void MainWindow::on_action_replace_all_s
1564      if (!file) return;      if (!file) return;
1565      Gtk::FileChooserDialog dialog(*this, _("Select Folder"),      Gtk::FileChooserDialog dialog(*this, _("Select Folder"),
1566                                    Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER);                                    Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER);
1567      view::WrapLabel description(      const char* str =
1568          _("This is a very specific function. It tries to replace all samples "          _("This is a very specific function. It tries to replace all samples "
1569            "in the current gig file by samples located in the chosen "            "in the current gig file by samples located in the chosen "
1570            "directory.\n\n"            "directory.\n\n"
# Line 1563  void MainWindow::on_action_replace_all_s Line 1578  void MainWindow::on_action_replace_all_s
1578            "the sample in the gig file accordingly. If you don't need an "            "the sample in the gig file accordingly. If you don't need an "
1579            "extension, blank the field below. Any gig sample where no "            "extension, blank the field below. Any gig sample where no "
1580            "appropriate sample file could be found will be reported and left "            "appropriate sample file could be found will be reported and left "
1581            "untouched.\n")            "untouched.\n");
1582      );  #if GTKMM_MAJOR_VERSION < 3
1583        view::WrapLabel description(str);
1584    #else
1585        Gtk::Label description(str);
1586        description.set_line_wrap();
1587    #endif
1588      Gtk::HBox entryArea;      Gtk::HBox entryArea;
1589      Gtk::Label entryLabel( _("Add filename extension: "), Gtk::ALIGN_START);      Gtk::Label entryLabel( _("Add filename extension: "), Gtk::ALIGN_START);
1590      Gtk::Entry postfixEntryBox;      Gtk::Entry postfixEntryBox;
Legend:
Removed from v.2246  
changed lines
  Added in v.2344
  ViewVC Help
Powered by ViewVC