quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor status text, status labels

Browse Source
This commit is contained in:
Garux 2018-05-31 16:16:47 +03:00
parent 6b8a1980af
commit 24c02facb2
5 changed files with 30 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
radiant/mainframe.cpp
View File

@ -2556,31 +2556,32 @@ GtkToolbar* create_main_toolbar( MainFrame::EViewStyle style ){
return toolbar; return toolbar;
} }
GtkWidget* create_main_statusbar( GtkWidget *pStatusLabel[c_count_status] ){ GtkWidget* create_main_statusbar( GtkWidget *pStatusLabel[c_status__count] ){
GtkTable* table = GTK_TABLE( gtk_table_new( 1, c_count_status, FALSE ) ); GtkTable* table = GTK_TABLE( gtk_table_new( 1, c_status__count, FALSE ) );
gtk_widget_show( GTK_WIDGET( table ) ); gtk_widget_show( GTK_WIDGET( table ) );
{ {
GtkLabel* label = GTK_LABEL( gtk_label_new( "Label" ) ); GtkLabel* label = GTK_LABEL( gtk_label_new( "Label" ) );
gtk_label_set_ellipsize( label, PANGO_ELLIPSIZE_END );
gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 ); gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 );
gtk_misc_set_padding( GTK_MISC( label ), 4, 2 ); gtk_misc_set_padding( GTK_MISC( label ), 4, 2 );
gtk_widget_show( GTK_WIDGET( label ) ); gtk_widget_show( GTK_WIDGET( label ) );
gtk_table_attach_defaults( table, GTK_WIDGET( label ), 0, 1, 0, 1 ); gtk_table_attach_defaults( table, GTK_WIDGET( label ), 0, 1, 0, 1 );
pStatusLabel[c_command_status] = GTK_WIDGET( label ); pStatusLabel[c_status_command] = GTK_WIDGET( label );
} }
for ( int i = 1; i < c_count_status; ++i ) for ( int i = 1; i < c_status__count; ++i )
{ {
GtkFrame* frame = GTK_FRAME( gtk_frame_new( 0 ) ); GtkFrame* frame = GTK_FRAME( gtk_frame_new( 0 ) );
gtk_widget_show( GTK_WIDGET( frame ) ); gtk_widget_show( GTK_WIDGET( frame ) );
gtk_table_attach_defaults( table, GTK_WIDGET( frame ), i, i + 1, 0, 1 ); gtk_table_attach_defaults( table, GTK_WIDGET( frame ), i, i + 1, 0, 1 );
gtk_frame_set_shadow_type( frame, GTK_SHADOW_IN ); gtk_frame_set_shadow_type( frame, GTK_SHADOW_IN );
if( i == c_grid_status ) if( i == c_status_grid )
gtk_widget_set_tooltip_text( GTK_WIDGET( frame ), "G: Grid size\nF: map Format\nC: camera Clip scale\nL: texture Lock " ); gtk_widget_set_tooltip_text( GTK_WIDGET( frame ), "G: Grid size\nF: map Format\nC: camera Clip scale\nL: texture Lock " );
GtkLabel* label = GTK_LABEL( gtk_label_new( "Label" ) ); GtkLabel* label = GTK_LABEL( gtk_label_new( "Label" ) );
if( i == c_texture_status ) if( i == c_status_texture )
gtk_label_set_ellipsize( label, PANGO_ELLIPSIZE_START ); gtk_label_set_ellipsize( label, PANGO_ELLIPSIZE_START );
else else
gtk_label_set_ellipsize( label, PANGO_ELLIPSIZE_END ); gtk_label_set_ellipsize( label, PANGO_ELLIPSIZE_END );
@ -2692,10 +2693,8 @@ MainFrame::MainFrame() : m_window( 0 ), m_idleRedrawStatusText( RedrawStatusText
m_pXZWnd = 0; m_pXZWnd = 0;
m_pActiveXY = 0; m_pActiveXY = 0;
for ( int n = 0; n < c_count_status; n++ ) for ( int n = 0; n < c_status__count; ++n )
{ m_statusLabel[n] = 0;
m_pStatusLabel[n] = 0;
}
Create(); Create();
} }
@ -2996,7 +2995,7 @@ void MainFrame::Create(){
GtkWidget* main_statusbar = create_main_statusbar( m_pStatusLabel ); GtkWidget* main_statusbar = create_main_statusbar( m_statusLabel );
gtk_box_pack_end( GTK_BOX( vbox ), main_statusbar, FALSE, TRUE, 2 ); gtk_box_pack_end( GTK_BOX( vbox ), main_statusbar, FALSE, TRUE, 2 );
GroupDialog_constructWindow( window ); GroupDialog_constructWindow( window );
@ -3212,7 +3211,7 @@ void MainFrame::Create(){
g_defaultToolMode = DragMode; g_defaultToolMode = DragMode;
g_defaultToolMode(); g_defaultToolMode();
SetStatusText( m_command_status, c_TranslateMode_status ); SetStatusText( c_status_command, c_TranslateMode_status );
EverySecondTimer_enable(); EverySecondTimer_enable();
@ -3299,26 +3298,22 @@ void MainFrame::Shutdown(){
} }
void MainFrame::RedrawStatusText(){ void MainFrame::RedrawStatusText(){
gtk_label_set_text( GTK_LABEL( m_pStatusLabel[c_command_status] ), m_command_status.c_str() ); for( int i = 0; i < c_status__count; ++i )
gtk_label_set_text( GTK_LABEL( m_pStatusLabel[c_position_status] ), m_position_status.c_str() ); gtk_label_set_text( GTK_LABEL( m_statusLabel[i] ), m_status[i].c_str() );
gtk_label_set_text( GTK_LABEL( m_pStatusLabel[c_brushcount_status] ), m_brushcount_status.c_str() );
gtk_label_set_text( GTK_LABEL( m_pStatusLabel[c_texture_status] ), m_texture_status.c_str() );
gtk_label_set_text( GTK_LABEL( m_pStatusLabel[c_grid_status] ), m_grid_status.c_str() );
} }
void MainFrame::UpdateStatusText(){ void MainFrame::UpdateStatusText(){
m_idleRedrawStatusText.queueDraw(); m_idleRedrawStatusText.queueDraw();
} }
void MainFrame::SetStatusText( CopiedString& status_text, const char* pText ){ void MainFrame::SetStatusText( int status_n, const char* status ){
status_text = pText; m_status[status_n] = status;
UpdateStatusText(); UpdateStatusText();
} }
void Sys_Status( const char* status ){ void Sys_Status( const char* status ){
if ( g_pParentWnd != 0 ) { if ( g_pParentWnd )
g_pParentWnd->SetStatusText( g_pParentWnd->m_command_status, status ); g_pParentWnd->SetStatusText( c_status_command, status );
}
} }
//int getRotateIncrement(){ //int getRotateIncrement(){
@ -3342,7 +3337,7 @@ void MainFrame::SetGridStatus(){
<< " F:" << GridStatus_getTexdefTypeIdLabel() << " F:" << GridStatus_getTexdefTypeIdLabel()
<< " C:" << GridStatus_getFarClipDistance() << " C:" << GridStatus_getFarClipDistance()
<< " L:" << lock; << " L:" << lock;
SetStatusText( m_grid_status, status.c_str() ); SetStatusText( c_status_grid, status.c_str() );
} }
void GridStatus_changed(){ void GridStatus_changed(){

22
radiant/mainframe.h
View File

@ -39,12 +39,12 @@ class ZWnd;
typedef struct _GtkWidget GtkWidget; typedef struct _GtkWidget GtkWidget;
typedef struct _GtkWindow GtkWindow; typedef struct _GtkWindow GtkWindow;
const int c_command_status = 0; const int c_status_command = 0;
const int c_position_status = 1; const int c_status_position = 1;
const int c_brushcount_status = 2; const int c_status_brushcount = 2;
const int c_texture_status = 3; const int c_status_texture = 3;
const int c_grid_status = 4; const int c_status_grid = 4;
const int c_count_status = 5; const int c_status__count = 5;
class MainFrame class MainFrame
{ {
@ -62,11 +62,6 @@ MainFrame();
GtkWindow* m_window; GtkWindow* m_window;
CopiedString m_command_status;
CopiedString m_position_status;
CopiedString m_brushcount_status;
CopiedString m_texture_status;
CopiedString m_grid_status;
private: private:
void Create(); void Create();
@ -87,7 +82,8 @@ CamWnd* m_pCamWnd;
ZWnd* m_pZWnd; ZWnd* m_pZWnd;
XYWnd* m_pActiveXY; XYWnd* m_pActiveXY;
GtkWidget *m_pStatusLabel[c_count_status]; CopiedString m_status[c_status__count];
GtkWidget *m_statusLabel[c_status__count];
EViewStyle m_nCurrentStyle; EViewStyle m_nCurrentStyle;
@ -97,7 +93,7 @@ IdleDraw m_idleRedrawStatusText;
public: public:
void SetStatusText( CopiedString& status_text, const char* pText ); void SetStatusText( int status_n, const char* status );
void UpdateStatusText(); void UpdateStatusText();
void RedrawStatusText(); void RedrawStatusText();
typedef MemberCaller<MainFrame, &MainFrame::RedrawStatusText> RedrawStatusTextCaller; typedef MemberCaller<MainFrame, &MainFrame::RedrawStatusText> RedrawStatusTextCaller;

2
radiant/qe3.cpp
View File

@ -126,7 +126,7 @@ SimpleCounter g_entityCount;
void QE_brushCountChanged(){ void QE_brushCountChanged(){
char buffer[128]; char buffer[128];
sprintf( buffer, "Brushes: %u Patches: %u Entities: %u", Unsigned( g_brushCount.get() ), Unsigned( g_patchCount.get() ), Unsigned( g_entityCount.get() ) ); sprintf( buffer, "Brushes: %u Patches: %u Entities: %u", Unsigned( g_brushCount.get() ), Unsigned( g_patchCount.get() ), Unsigned( g_entityCount.get() ) );
g_pParentWnd->SetStatusText( g_pParentWnd->m_brushcount_status, buffer ); g_pParentWnd->SetStatusText( c_status_brushcount, buffer );
} }

2
radiant/texwindow.cpp
View File

@ -397,7 +397,7 @@ void TextureBrowser_SetStatus( TextureBrowser& textureBrowser, const char* name
StringOutputStream strTex( 256 ); StringOutputStream strTex( 256 );
strTex << name << " W: " << Unsigned( q->width ) << " H: " << Unsigned( q->height ); strTex << name << " W: " << Unsigned( q->width ) << " H: " << Unsigned( q->height );
shader->DecRef(); shader->DecRef();
g_pParentWnd->SetStatusText( g_pParentWnd->m_texture_status, strTex.c_str() ); g_pParentWnd->SetStatusText( c_status_texture, strTex.c_str() );
} }
void TextureBrowser_Focus( TextureBrowser& textureBrowser, const char* name ); void TextureBrowser_Focus( TextureBrowser& textureBrowser, const char* name );

2
radiant/xywindow.cpp
View File

@ -1195,7 +1195,7 @@ void XYWnd::XY_MouseMoved( int x, int y, unsigned int buttons ){
status << "x:: " << FloatFormat( m_mousePosition[0], 6, 1 ) status << "x:: " << FloatFormat( m_mousePosition[0], 6, 1 )
<< " y:: " << FloatFormat( m_mousePosition[1], 6, 1 ) << " y:: " << FloatFormat( m_mousePosition[1], 6, 1 )
<< " z:: " << FloatFormat( m_mousePosition[2], 6, 1 ); << " z:: " << FloatFormat( m_mousePosition[2], 6, 1 );
g_pParentWnd->SetStatusText( g_pParentWnd->m_position_status, status.c_str() ); g_pParentWnd->SetStatusText( c_status_position, status.c_str() );
} }
if ( g_bCrossHairs ) { if ( g_bCrossHairs ) {