Add icons to some of the dialogs missing them

Originally committed to SVN as r6651.
This commit is contained in:
Thomas Goyne 2012-04-03 20:40:33 +00:00
parent fe36760872
commit 462448c7d1
6 changed files with 12 additions and 3 deletions

View file

@ -38,6 +38,8 @@
#include "config.h"
#ifndef AGI_PRE
#include <algorithm>
#include <wx/button.h>
#include <wx/filedlg.h>
#include <wx/filename.h>

View file

@ -55,6 +55,7 @@
#include "colour_button.h"
#include "compat.h"
#include "help_button.h"
#include "libresrc/libresrc.h"
#include "main.h"
#include "utils.h"
#include "video_provider_dummy.h"
@ -153,14 +154,14 @@ bool DialogDummyVideo::CreateDummyVideo(wxWindow *parent, wxString &out_filename
}
}
/// @brief DOCME
/// @param parent
///
DialogDummyVideo::DialogDummyVideo(wxWindow *parent)
: wxDialog(parent, -1, _("Dummy video options"),wxDefaultPosition,wxDefaultSize)
{
SetIcon(GETICON(use_dummy_video_menu_16));
// Main controls
length_display = 0;
resolution_shortcuts = new wxComboBox(this, Dummy_Video_Resolution_Shortcut, "", wxDefaultPosition, wxDefaultSize, 0, 0, wxCB_READONLY);

View file

@ -51,12 +51,14 @@
#include "include/aegisub/context.h"
#include "charset_conv.h"
#include "help_button.h"
#include "libresrc/libresrc.h"
DialogExport::DialogExport(agi::Context *c)
: wxDialog(c->parent, -1, _("Export"), wxDefaultPosition, wxSize(200, 100), wxCAPTION | wxCLOSE_BOX)
, c(c)
, exporter(new AssExporter(c))
{
SetIcon(GETICON(export_menu_16));
SetExtraStyle(wxWS_EX_VALIDATE_RECURSIVELY);
wxArrayString filters = exporter->GetAllFilterNames();

View file

@ -43,6 +43,7 @@
#include "frame_main.h"
#include "help_button.h"
#include "include/aegisub/context.h"
#include "libresrc/libresrc.h"
#include "main.h"
#include "selection_controller.h"
@ -131,6 +132,8 @@ DialogSelection::DialogSelection(agi::Context *c) :
wxDialog (c->parent, -1, _("Select"), wxDefaultPosition, wxDefaultSize, wxCAPTION)
, con(c)
{
SetIcon(GETICON(select_lines_button_16));
wxSizer *main_sizer = new wxBoxSizer(wxVERTICAL);
wxSizerFlags main_flags = wxSizerFlags().Expand().Border();

View file

@ -38,6 +38,7 @@
#include "dialog_style_manager.h"
#ifndef AGI_PRE
#include <algorithm>
#include <tr1/functional>
#include <wx/bmpbuttn.h>

View file

@ -658,7 +658,7 @@ static void PageChanged(wxBookCtrlEvent& evt) {
}
Preferences::Preferences(wxWindow *parent): wxDialog(parent, -1, _("Preferences"), wxDefaultPosition, wxSize(-1, 500)) {
// SetIcon(GETICON(options_button_16));
SetIcon(GETICON(options_button_16));
book = new wxTreebook(this, -1, wxDefaultPosition, wxDefaultSize);
new General(book, this);