From f0195d40acca6e8c7b46058bfd4f32e777b5b287 Mon Sep 17 00:00:00 2001 From: Stelios Bounanos Date: Tue, 7 Oct 2008 08:51:08 +0100 Subject: [PATCH] Unclutter title bar --- src/dialogs/fl_digi.cxx | 21 ++++++++------------- src/dialogs/htmlstrings.cxx | 4 ++-- src/misc/macroedit.cxx | 15 +++++++++------ 3 files changed, 19 insertions(+), 21 deletions(-) diff --git a/src/dialogs/fl_digi.cxx b/src/dialogs/fl_digi.cxx index abc2908c..5e122b60 100644 --- a/src/dialogs/fl_digi.cxx +++ b/src/dialogs/fl_digi.cxx @@ -1643,18 +1643,13 @@ int below(Fl_Widget* w) return (a & FL_ALIGN_BOTTOM) ? w->y() + w->h() + FL_NORMAL_SIZE : w->y() + w->h(); } -char main_window_title[256]; -void update_main_title() { - string macrotitle = " -- "; - macrotitle.append(progStatus.LastMacroFile); - - snprintf(main_window_title, sizeof(main_window_title), - "%s %s -- %s %s", - PACKAGE_NAME, PACKAGE_VERSION, - progdefaults.myCall.empty() ? "NO CALLSIGN SET" : progdefaults.myCall.c_str(), - macrotitle.c_str()); +string main_window_title; +void update_main_title() +{ + main_window_title = PACKAGE_TARNAME " - "; + main_window_title += (progdefaults.myCall.empty() ? "NO CALLSIGN SET" : progdefaults.myCall.c_str()); if (fl_digi_main != NULL) - fl_digi_main->label(main_window_title); + fl_digi_main->label(main_window_title.c_str()); } @@ -1665,7 +1660,7 @@ void create_fl_digi_main() { if (twoscopes) WNOM -= 2*DEFAULT_SW; update_main_title(); - fl_digi_main = new Fl_Double_Window(WNOM, HNOM, main_window_title); + fl_digi_main = new Fl_Double_Window(WNOM, HNOM, main_window_title.c_str()); mnu = new Fl_Menu_Bar(0, 0, WNOM - 150 - pad, Hmenu); // FL_NORMAL_SIZE may have changed; update the menu items for (size_t i = 0; i < sizeof(menu_)/sizeof(menu_[0]); i++) @@ -1680,7 +1675,7 @@ void create_fl_digi_main() { Fl_Tooltip::font(FL_HELVETICA); Fl_Tooltip::size(FL_NORMAL_SIZE); - btnRSID = new Fl_Light_Button(WNOM - 150 - pad, 0, 50, Hmenu, "RSID ?"); + btnRSID = new Fl_Light_Button(WNOM - 150 - pad, 0, 50, Hmenu, "RSID"); btnRSID->selection_color(FL_GREEN); btnRSID->callback(cbRSID, 0); diff --git a/src/dialogs/htmlstrings.cxx b/src/dialogs/htmlstrings.cxx index e0e9d06d..cf4593ea 100644 --- a/src/dialogs/htmlstrings.cxx +++ b/src/dialogs/htmlstrings.cxx @@ -553,7 +553,7 @@ char szAbout[] = \ \
\ -

Fldigi

\ +

Fldigi " PACKAGE_VERSION "

\
\
\

Digital modem program for


\ @@ -561,7 +561,7 @@ char szAbout[] =      Linux
\      FreeBSD
\      OS X
\ -     Windows (XP)
\ +     Windows
\
\

Programmers:


\

\ diff --git a/src/misc/macroedit.cxx b/src/misc/macroedit.cxx index 5d83754a..43c46e17 100644 --- a/src/misc/macroedit.cxx +++ b/src/misc/macroedit.cxx @@ -9,6 +9,7 @@ #include "macros.h" #include "macroedit.h" #include "globals.h" +#include "status.h" #include @@ -138,10 +139,13 @@ void cbInsertMacro(Fl_Widget *, void *) macrotext->take_focus(); } -Fl_Double_Window* make_macroeditor() { - Fl_Double_Window* w; - { Fl_Double_Window* o = new Fl_Double_Window(700, 230, "Edit User Macro"); - w = o; +static string editor_label; + +Fl_Double_Window* make_macroeditor(void) +{ + editor_label.append("Macro editor - ").append(progStatus.LastMacroFile); + + Fl_Double_Window* w = new Fl_Double_Window(700, 230, editor_label.c_str()); labeltext = new Fl_Input(114, 15, 95, 25, "Label:"); btnMacroEditOK = new Fl_Button(500, 15, 75, 25, "OK"); @@ -160,8 +164,7 @@ Fl_Double_Window* make_macroeditor() { macroDefs = new Fl_Hold_Browser(490, 60, 200, 165); macroDefs->column_widths(widths); loadBrowser(macroDefs); - o->end(); - } + w->end(); return w; }