X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=radiant%2Ffindtexturedialog.cpp;h=d74fc6578ac7dcabc442a1ee328a58019e839659;hb=cd6613e5171544b68d4ae70546c90a15c99b22a5;hp=2a6c028199d2402385aa5148d1e58f25dce70c7d;hpb=cd7ff1a1798cfae5d14811a310f56d2f1908490b;p=xonotic%2Fnetradiant.git

diff --git a/radiant/findtexturedialog.cpp b/radiant/findtexturedialog.cpp
index 2a6c0281..d74fc657 100644
--- a/radiant/findtexturedialog.cpp
+++ b/radiant/findtexturedialog.cpp
@@ -42,243 +42,217 @@
 #include "textureentry.h"
 
 
-class FindTextureDialog : public Dialog {
-public:
-    static void setReplaceStr(const char *name);
-
-    static void setFindStr(const char *name);
 
-    static bool isOpen();
+class FindTextureDialog : public Dialog
+{
+public:
+static void setReplaceStr( const char* name );
+static void setFindStr( const char* name );
+static bool isOpen();
+static void show();
+typedef FreeCaller<void(), &FindTextureDialog::show> ShowCaller;
+static void updateTextures( const char* name );
+
+FindTextureDialog();
+virtual ~FindTextureDialog();
+ui::Window BuildDialog();
+
+void constructWindow( ui::Window parent ){
+	m_parent = parent;
+	Create();
+}
+void destroyWindow(){
+	Destroy();
+}
 
-    static void show();
 
-    typedef FreeCaller<void(), &FindTextureDialog::show> ShowCaller;
+bool m_bSelectedOnly;
+CopiedString m_strFind;
+CopiedString m_strReplace;
+};
 
-    static void updateTextures(const char *name);
+FindTextureDialog g_FindTextureDialog;
+static bool g_bFindActive = true;
 
-    FindTextureDialog();
+namespace
+{
+void FindTextureDialog_apply(){
+	StringOutputStream find( 256 );
+	StringOutputStream replace( 256 );
 
-    virtual ~FindTextureDialog();
+	find << "textures/" << g_FindTextureDialog.m_strFind.c_str();
+	replace << "textures/" << g_FindTextureDialog.m_strReplace.c_str();
+	FindReplaceTextures( find.c_str(), replace.c_str(), g_FindTextureDialog.m_bSelectedOnly );
+}
 
-    ui::Window BuildDialog();
+static void OnApply( ui::Widget widget, gpointer data ){
+	g_FindTextureDialog.exportData();
+	FindTextureDialog_apply();
+}
 
-    void constructWindow(ui::Window parent)
-    {
-        m_parent = parent;
-        Create();
-    }
+static void OnFind( ui::Widget widget, gpointer data ){
+	g_FindTextureDialog.exportData();
+	FindTextureDialog_apply();
+}
 
-    void destroyWindow()
-    {
-        Destroy();
-    }
+static void OnOK( ui::Widget widget, gpointer data ){
+	g_FindTextureDialog.exportData();
+	FindTextureDialog_apply();
+	g_FindTextureDialog.HideDlg();
+}
 
+static void OnClose( ui::Widget widget, gpointer data ){
+	g_FindTextureDialog.HideDlg();
+}
 
-    bool m_bSelectedOnly;
-    CopiedString m_strFind;
-    CopiedString m_strReplace;
-};
 
-FindTextureDialog g_FindTextureDialog;
-static bool g_bFindActive = true;
+static gint find_focus_in( ui::Widget widget, GdkEventFocus *event, gpointer data ){
+	g_bFindActive = true;
+	return FALSE;
+}
 
-namespace {
-    void FindTextureDialog_apply()
-    {
-        StringOutputStream find(256);
-        StringOutputStream replace(256);
-
-        find << "textures/" << g_FindTextureDialog.m_strFind.c_str();
-        replace << "textures/" << g_FindTextureDialog.m_strReplace.c_str();
-        FindReplaceTextures(find.c_str(), replace.c_str(), g_FindTextureDialog.m_bSelectedOnly);
-    }
-
-    static void OnApply(ui::Widget widget, gpointer data)
-    {
-        g_FindTextureDialog.exportData();
-        FindTextureDialog_apply();
-    }
-
-    static void OnFind(ui::Widget widget, gpointer data)
-    {
-        g_FindTextureDialog.exportData();
-        FindTextureDialog_apply();
-    }
-
-    static void OnOK(ui::Widget widget, gpointer data)
-    {
-        g_FindTextureDialog.exportData();
-        FindTextureDialog_apply();
-        g_FindTextureDialog.HideDlg();
-    }
-
-    static void OnClose(ui::Widget widget, gpointer data)
-    {
-        g_FindTextureDialog.HideDlg();
-    }
-
-
-    static gint find_focus_in(ui::Widget widget, GdkEventFocus *event, gpointer data)
-    {
-        g_bFindActive = true;
-        return FALSE;
-    }
-
-    static gint replace_focus_in(ui::Widget widget, GdkEventFocus *event, gpointer data)
-    {
-        g_bFindActive = false;
-        return FALSE;
-    }
+static gint replace_focus_in( ui::Widget widget, GdkEventFocus *event, gpointer data ){
+	g_bFindActive = false;
+	return FALSE;
+}
 }
 
 // =============================================================================
 // FindTextureDialog class
 
-FindTextureDialog::FindTextureDialog()
-{
-    m_bSelectedOnly = FALSE;
+FindTextureDialog::FindTextureDialog(){
+	m_bSelectedOnly = FALSE;
 }
 
-FindTextureDialog::~FindTextureDialog()
-{
+FindTextureDialog::~FindTextureDialog(){
 }
 
-ui::Window FindTextureDialog::BuildDialog()
-{
+ui::Window FindTextureDialog::BuildDialog(){
     ui::Widget label{ui::null};
-    ui::Widget button{ui::null};
-    ui::Entry entry{ui::null};
+	ui::Widget button{ui::null};
+	ui::Entry entry{ui::null};
 
-    auto dlg = ui::Window(create_floating_window("Find / Replace Texture(s)", m_parent));
+	auto dlg = ui::Window(create_floating_window( "Find / Replace Texture(s)", m_parent ));
 
-    auto hbox = ui::HBox(FALSE, 5);
-    hbox.show();
-    dlg.add(hbox);
-    gtk_container_set_border_width(GTK_CONTAINER(hbox), 5);
+	auto hbox = ui::HBox( FALSE, 5 );
+	hbox.show();
+	dlg.add(hbox);
+	gtk_container_set_border_width( GTK_CONTAINER( hbox ), 5 );
 
-    auto vbox = ui::VBox(FALSE, 5);
-    vbox.show();
-    hbox.pack_start(vbox, TRUE, TRUE, 0);
+	auto vbox = ui::VBox( FALSE, 5 );
+	vbox.show();
+	hbox.pack_start( vbox, TRUE, TRUE, 0 );
 
     auto table = ui::Table(2, 2, FALSE);
-    table.show();
-    vbox.pack_start(table, TRUE, TRUE, 0);
+	table.show();
+	vbox.pack_start( table, TRUE, TRUE, 0 );
     gtk_table_set_row_spacings(table, 5);
     gtk_table_set_col_spacings(table, 5);
 
-    label = ui::Label("Find:");
-    label.show();
+	label = ui::Label( "Find:" );
+	label.show();
     table.attach(label, {0, 1, 0, 1}, {GTK_FILL, 0});
-    gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+	gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 );
 
-    label = ui::Label("Replace:");
-    label.show();
+	label = ui::Label( "Replace:" );
+	label.show();
     table.attach(label, {0, 1, 1, 2}, {GTK_FILL, 0});
-    gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+	gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 );
 
-    entry = ui::Entry(ui::New);
-    entry.show();
+	entry = ui::Entry(ui::New);
+	entry.show();
     table.attach(entry, {1, 2, 0, 1}, {GTK_EXPAND | GTK_FILL, 0});
-    entry.connect("focus_in_event",
-                  G_CALLBACK(find_focus_in), 0);
-    AddDialogData(entry, m_strFind);
-    GlobalTextureEntryCompletion::instance().connect(entry);
+	entry.connect( "focus_in_event",
+					  G_CALLBACK( find_focus_in ), 0 );
+	AddDialogData( entry, m_strFind );
+	GlobalTextureEntryCompletion::instance().connect( entry );
 
-    entry = ui::Entry(ui::New);
-    entry.show();
+	entry = ui::Entry(ui::New);
+	entry.show();
     table.attach(entry, {1, 2, 1, 2}, {GTK_EXPAND | GTK_FILL, 0});
-    entry.connect("focus_in_event",
-                  G_CALLBACK(replace_focus_in), 0);
-    AddDialogData(entry, m_strReplace);
-    GlobalTextureEntryCompletion::instance().connect(entry);
-
-    auto check = ui::CheckButton("Within selected brushes only");
-    check.show();
-    vbox.pack_start(check, TRUE, TRUE, 0);
-    AddDialogData(check, m_bSelectedOnly);
-
-    vbox = ui::VBox(FALSE, 5);
-    vbox.show();
-    hbox.pack_start(vbox, FALSE, FALSE, 0);
-
-    button = ui::Button("Apply");
-    button.show();
-    vbox.pack_start(button, FALSE, FALSE, 0);
-    button.connect("clicked",
-                   G_CALLBACK(OnApply), 0);
-    button.dimensions(60, -1);
-
-    button = ui::Button("Close");
-    button.show();
-    vbox.pack_start(button, FALSE, FALSE, 0);
-    button.connect("clicked",
-                   G_CALLBACK(OnClose), 0);
-    button.dimensions(60, -1);
-
-    return dlg;
+	entry.connect( "focus_in_event",
+					  G_CALLBACK( replace_focus_in ), 0 );
+	AddDialogData( entry, m_strReplace );
+	GlobalTextureEntryCompletion::instance().connect( entry );
+
+	auto check = ui::CheckButton( "Within selected brushes only" );
+	check.show();
+	vbox.pack_start( check, TRUE, TRUE, 0 );
+	AddDialogData( check, m_bSelectedOnly );
+
+	vbox = ui::VBox( FALSE, 5 );
+	vbox.show();
+	hbox.pack_start( vbox, FALSE, FALSE, 0 );
+
+	button = ui::Button( "Apply" );
+	button.show();
+	vbox.pack_start( button, FALSE, FALSE, 0 );
+	button.connect( "clicked",
+					  G_CALLBACK( OnApply ), 0 );
+	button.dimensions(60, -1);
+
+	button = ui::Button( "Close" );
+	button.show();
+	vbox.pack_start( button, FALSE, FALSE, 0 );
+	button.connect( "clicked",
+					  G_CALLBACK( OnClose ), 0 );
+	button.dimensions(60, -1);
+
+	return dlg;
 }
 
-void FindTextureDialog::updateTextures(const char *name)
-{
-    if (isOpen()) {
-        if (g_bFindActive) {
-            setFindStr(name + 9);
-        } else {
-            setReplaceStr(name + 9);
-        }
-    }
+void FindTextureDialog::updateTextures( const char* name ){
+	if ( isOpen() ) {
+		if ( g_bFindActive ) {
+			setFindStr( name + 9 );
+		}
+		else
+		{
+			setReplaceStr( name + 9 );
+		}
+	}
 }
 
-bool FindTextureDialog::isOpen()
-{
-    return g_FindTextureDialog.GetWidget().visible();
+bool FindTextureDialog::isOpen(){
+	return g_FindTextureDialog.GetWidget().visible();
 }
 
-void FindTextureDialog::setFindStr(const char *name)
-{
-    g_FindTextureDialog.exportData();
-    g_FindTextureDialog.m_strFind = name;
-    g_FindTextureDialog.importData();
+void FindTextureDialog::setFindStr( const char* name ){
+	g_FindTextureDialog.exportData();
+	g_FindTextureDialog.m_strFind = name;
+	g_FindTextureDialog.importData();
 }
 
-void FindTextureDialog::setReplaceStr(const char *name)
-{
-    g_FindTextureDialog.exportData();
-    g_FindTextureDialog.m_strReplace = name;
-    g_FindTextureDialog.importData();
+void FindTextureDialog::setReplaceStr( const char* name ){
+	g_FindTextureDialog.exportData();
+	g_FindTextureDialog.m_strReplace = name;
+	g_FindTextureDialog.importData();
 }
 
-void FindTextureDialog::show()
-{
-    g_FindTextureDialog.ShowDlg();
+void FindTextureDialog::show(){
+	g_FindTextureDialog.ShowDlg();
 }
 
 
-void FindTextureDialog_constructWindow(ui::Window main_window)
-{
-    g_FindTextureDialog.constructWindow(main_window);
+void FindTextureDialog_constructWindow( ui::Window main_window ){
+	g_FindTextureDialog.constructWindow( main_window );
 }
 
-void FindTextureDialog_destroyWindow()
-{
-    g_FindTextureDialog.destroyWindow();
+void FindTextureDialog_destroyWindow(){
+	g_FindTextureDialog.destroyWindow();
 }
 
-bool FindTextureDialog_isOpen()
-{
-    return g_FindTextureDialog.isOpen();
+bool FindTextureDialog_isOpen(){
+	return g_FindTextureDialog.isOpen();
 }
 
-void FindTextureDialog_selectTexture(const char *name)
-{
-    g_FindTextureDialog.updateTextures(name);
+void FindTextureDialog_selectTexture( const char* name ){
+	g_FindTextureDialog.updateTextures( name );
 }
 
-void FindTextureDialog_Construct()
-{
-    GlobalCommands_insert("FindReplaceTextures", FindTextureDialog::ShowCaller());
+void FindTextureDialog_Construct(){
+	GlobalCommands_insert( "FindReplaceTextures", FindTextureDialog::ShowCaller() );
 }
 
-void FindTextureDialog_Destroy()
-{
+void FindTextureDialog_Destroy(){
 }