#include <gdk/gdkkeysyms.h>
#include <uilib/uilib.h>
+#include <gtk/gtkspinbutton.h>
#include "os/path.h"
#include "math/aabb.h"
void DoSides( int type, int axis ){
ModalDialog dialog;
+ //GtkEntry* sides_entry;
+ GtkWidget* sides_spin;
auto window = MainFrame_getWindow().create_dialog_window("Arbitrary sides", G_CALLBACK(dialog_delete_callback ), &dialog );
label.show();
hbox.pack_start( label, FALSE, FALSE, 0 );
}
+// {
+// auto entry = sides_entry;
+// entry.show();
+// hbox.pack_start( entry, FALSE, FALSE, 0 );
+// gtk_widget_grab_focus( entry );
+// }
{
- auto entry = sides_entry;
- entry.show();
- hbox.pack_start( entry, FALSE, FALSE, 0 );
- gtk_widget_grab_focus( entry );
+ GtkAdjustment* adj;
+ EBrushPrefab BrushPrefabType = (EBrushPrefab)type;
+ switch ( BrushPrefabType )
+ {
+ case eBrushPrism :
+ case eBrushCone :
+ adj = GTK_ADJUSTMENT( gtk_adjustment_new( 8, 3, 1022, 1, 10, 0 ) );
+ break;
+ case eBrushSphere :
+ adj = GTK_ADJUSTMENT( gtk_adjustment_new( 8, 3, 31, 1, 10, 0 ) );
+ break;
+ case eBrushRock :
+ adj = GTK_ADJUSTMENT( gtk_adjustment_new( 32, 10, 1000, 1, 10, 0 ) );
+ break;
+ default:
+ adj = GTK_ADJUSTMENT( gtk_adjustment_new( 8, 3, 31, 1, 10, 0 ) );
+ break;
+ }
+
+ GtkWidget* spin = gtk_spin_button_new( adj, 1, 0 );
+ gtk_widget_show( spin );
+ gtk_box_pack_start( GTK_BOX( hbox ), spin, FALSE, FALSE, 0 );
+ gtk_widget_set_size_request( spin, 64, -1 );
+ gtk_spin_button_set_numeric( GTK_SPIN_BUTTON( spin ), TRUE );
+
+ sides_spin = spin;
}
{
auto vbox = create_dialog_vbox( 4 );
}
if ( modal_dialog_show( window, dialog ) == eIDOK ) {
- const char *str = gtk_entry_get_text( sides_entry );
+// const char *str = gtk_entry_get_text( sides_entry );
- Scene_BrushConstructPrefab( GlobalSceneGraph(), (EBrushPrefab)type, atoi( str ), TextureBrowser_GetSelectedShader( GlobalTextureBrowser() ) );
+// Scene_BrushConstructPrefab( GlobalSceneGraph(), (EBrushPrefab)type, atoi( str ), TextureBrowser_GetSelectedShader( GlobalTextureBrowser() ) );
+ gtk_spin_button_update ( GTK_SPIN_BUTTON( sides_spin ) );
+ int sides = static_cast<int>( gtk_spin_button_get_value( GTK_SPIN_BUTTON( sides_spin ) ) );
+ Scene_BrushConstructPrefab( GlobalSceneGraph(), (EBrushPrefab)type, sides, TextureBrowser_GetSelectedShader( GlobalTextureBrowser() ) );
}
window.destroy();
void about_button_changelog( ui::Widget widget, gpointer data ){
StringOutputStream log( 256 );
- log << "https://gitlab.com/xonotic/netradiant/commits/master";
+ log << "https://gitlab.com/xonotic/netradiant/-/commits/master";
OpenURL( log.c_str() );
}
void about_button_credits( ui::Widget widget, gpointer data ){
StringOutputStream cred( 256 );
- cred << "https://gitlab.com/xonotic/netradiant/graphs/master";
+ cred << "https://gitlab.com/xonotic/netradiant/-/graphs/master";
OpenURL( cred.c_str() );
}
void about_button_issues( ui::Widget widget, gpointer data ){
StringOutputStream cred( 256 );
- cred << "https://gitlab.com/xonotic/netradiant/issues";
+ cred << "https://gitlab.com/xonotic/netradiant/-/issues";
OpenURL( cred.c_str() );
}
static void CreateGtkTextEditor(){
auto dlg = ui::Window( ui::window_type::TOP );
- dlg.connect( "delete_event",
- G_CALLBACK( editor_delete ), 0 );
- gtk_window_set_default_size( dlg, 400, 300 );
+ dlg.connect( "", G_CALLBACK( editor_delete ), 0 );
+ gtk_window_set_default_size( dlg, 400, 600 );
auto vbox = ui::VBox( FALSE, 5 );
vbox.show();
// trying to show later
text_editor.show();
+ gtk_window_present( GTK_WINDOW( text_editor ) );
-#if GDEF_OS_WINDOWS
+//#if GDEF_OS_WINDOWS
ui::process();
-#endif
+//#endif
// only move the cursor if it's not exceeding the size..
// NOTE: this is erroneous, cursorpos is the offset in bytes, not in characters
gtk_text_view_scroll_to_iter( GTK_TEXT_VIEW( text_widget ), &text_iter, 0, TRUE, 0, 0);
}
-#if GDEF_OS_WINDOWS
+//#if GDEF_OS_WINDOWS
gtk_widget_queue_draw( text_widget );
-#endif
+//#endif
text_buffer_ = text_buffer;
free( buf );
#include <gdk/gdkwin32.h>
#endif
-#if GDEF_OS_WINDOWS
-// use the file associations to open files instead of builtin Gtk editor
-bool g_TextEditor_useWin32Editor = false;
-#else
-// custom shader editor
-bool g_TextEditor_useCustomEditor = false;
CopiedString g_TextEditor_editorCommand( "" );
-#endif
-void DoTextEditor( const char* filename, int cursorpos, int length ){
-#if GDEF_OS_WINDOWS
- if ( g_TextEditor_useWin32Editor ) {
- StringOutputStream path( 256 );
- StringOutputStream modpath( 256 );
- const char* gamename = GlobalRadiant().getGameName();
- const char* basegame = GlobalRadiant().getRequiredGameDescriptionKeyValue( "basegame" );
- const char* enginePath = GlobalRadiant().getEnginePath();
- path << enginePath << basegame << '/' << filename;
- modpath << enginePath << gamename << '/' << filename;
- if ( file_exists( modpath.c_str() ) ){
- globalOutputStream() << "opening file '" << modpath.c_str() << "' (line " << cursorpos << " info ignored)\n";
- ShellExecute( (HWND)GDK_WINDOW_HWND( gtk_widget_get_window( MainFrame_getWindow() ) ), "open", modpath.c_str(), 0, 0, SW_SHOW );
+void DoTextEditor( const char* filename, int cursorpos, int length, bool external_editor ){
+ //StringOutputStream paths[4]( 256 );
+ StringOutputStream paths[4] = { StringOutputStream(256) };
+ StringOutputStream* goodpath = 0;
+
+ const char* gamename = GlobalRadiant().getGameName();
+ const char* basegame = GlobalRadiant().getRequiredGameDescriptionKeyValue( "basegame" );
+ const char* enginePath = GlobalRadiant().getEnginePath();
+ const char* homeEnginePath = g_qeglobals.m_userEnginePath.c_str();
+
+ paths[0] << homeEnginePath << gamename << '/' << filename;
+ paths[1] << enginePath << gamename << '/' << filename;
+ paths[2] << homeEnginePath << basegame << '/' << filename;
+ paths[3] << enginePath << basegame << '/' << filename;
+
+ for ( std::size_t i = 0; i < 4; ++i ){
+ if ( file_exists( paths[i].c_str() ) ){
+ goodpath = &paths[i];
+ break;
}
- else if ( file_exists( path.c_str() ) ){
- globalOutputStream() << "opening file '" << path.c_str() << "' (line " << cursorpos << " info ignored)\n";
- ShellExecute( (HWND)GDK_WINDOW_HWND( gtk_widget_get_window( MainFrame_getWindow() ) ), "open", path.c_str(), 0, 0, SW_SHOW );
- }
- else{
- globalOutputStream() << "Failed to open '" << filename << "\n";
- }
- return;
}
- else{
- StringOutputStream path( 256 );
- StringOutputStream modpath( 256 );
- const char* gamename = GlobalRadiant().getGameName();
- const char* basegame = GlobalRadiant().getRequiredGameDescriptionKeyValue( "basegame" );
- const char* enginePath = GlobalRadiant().getEnginePath();
- path << enginePath << basegame << '/' << filename;
- modpath << enginePath << gamename << '/' << filename;
- if ( file_exists( modpath.c_str() ) ){
- globalOutputStream() << "opening file '" << modpath.c_str() << "' (line " << cursorpos << " info ignored)\n";
- DoGtkTextEditor( modpath.c_str(), cursorpos, length );
- }
- else if ( file_exists( path.c_str() ) ){
- globalOutputStream() << "opening file '" << path.c_str() << "' (line " << cursorpos << " info ignored)\n";
- DoGtkTextEditor( path.c_str(), cursorpos, length );
+
+ if( goodpath ){
+ globalOutputStream() << "opening file '" << goodpath->c_str() << "' (line " << cursorpos << " info ignored)\n";
+ if( external_editor ){
+ if( g_TextEditor_editorCommand.empty() ){
+#ifdef WIN32
+ ShellExecute( (HWND)GDK_WINDOW_HWND( GTK_WIDGET( MainFrame_getWindow() )->window ), 0, goodpath->c_str(), 0, 0, SW_SHOWNORMAL );
+// SHELLEXECUTEINFO ShExecInfo;
+// ShExecInfo.cbSize = sizeof(SHELLEXECUTEINFO);
+// ShExecInfo.fMask = 0;
+// ShExecInfo.hwnd = (HWND)GDK_WINDOW_HWND( GTK_WIDGET( MainFrame_getWindow() )->window );
+// ShExecInfo.lpVerb = NULL;
+// ShExecInfo.lpFile = goodpath->c_str();
+// ShExecInfo.lpParameters = NULL;
+// ShExecInfo.lpDirectory = NULL;
+// ShExecInfo.nShow = SW_SHOWNORMAL;
+// ShExecInfo.hInstApp = NULL;
+// ShellExecuteEx(&ShExecInfo);
+#else
+ globalOutputStream() << "Failed to open '" << goodpath->c_str() << "'\nSet Shader Editor Command in preferences\n";
+#endif
+ }
+ else{
+ StringOutputStream strEditCommand( 256 );
+ strEditCommand << g_TextEditor_editorCommand.c_str() << " \"" << goodpath->c_str() << "\"";
+
+ globalOutputStream() << "Launching: " << strEditCommand.c_str() << "\n";
+ // note: linux does not return false if the command failed so it will assume success
+ if ( Q_Exec( 0, const_cast<char*>( strEditCommand.c_str() ), 0, true, false ) == false ) {
+ globalOutputStream() << "Failed to execute " << strEditCommand.c_str() << "\n";
+ }
+ else
+ {
+ // the command (appeared) to run successfully, no need to do anything more
+ return;
+ }
+ }
}
else{
- globalOutputStream() << "Failed to open '" << filename << "\n";
+ DoGtkTextEditor( goodpath->c_str(), cursorpos, length );
}
- return;
}
-#else
- // check if a custom editor is set
- if ( g_TextEditor_useCustomEditor && !g_TextEditor_editorCommand.empty() ) {
- StringOutputStream strEditCommand( 256 );
- strEditCommand << g_TextEditor_editorCommand.c_str() << " \"" << filename << "\"";
-
- globalOutputStream() << "Launching: " << strEditCommand.c_str() << "\n";
- // note: linux does not return false if the command failed so it will assume success
- if ( Q_Exec( 0, const_cast<char*>( strEditCommand.c_str() ), 0, true, false ) == false ) {
- globalOutputStream() << "Failed to execute " << strEditCommand.c_str() << ", using default\n";
- }
- else
- {
- // the command (appeared) to run successfully, no need to do anything more
- return;
- }
+ else{
+ globalOutputStream() << "Failed to open '" << filename << "'\nOne sits in .pk3 most likely!\n";
}
-
- DoGtkTextEditor( filename, cursorpos, length );
-#endif
}