diff options
Diffstat (limited to 'app/bin/smalldlg.c')
| -rw-r--r-- | app/bin/smalldlg.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/app/bin/smalldlg.c b/app/bin/smalldlg.c index 7828912..1fb5965 100644 --- a/app/bin/smalldlg.c +++ b/app/bin/smalldlg.c @@ -36,6 +36,7 @@ #ifdef WINDOWS #include <io.h> #include <windows.h> +#include <FreeImage.h> #else #include <sys/stat.h> #endif @@ -67,7 +68,7 @@ static paramData_t tipPLs[] = { #define I_TIPTEXT (1) #define tipT ((wText_p)tipPLs[I_TIPTEXT].control) { PD_MESSAGE, N_("Did you know..."), NULL, 0, NULL, NULL, BM_LARGE }, - { PD_TEXT, NULL, "text", 0, &tipTextData, NULL, BO_READONLY|BT_CHARUNITS }, + { PD_TEXT, NULL, "text", 0, &tipTextData, NULL, BO_READONLY|BT_TOP|BT_CHARUNITS }, { PD_BUTTON, (void*)ShowTip, "prev", PDO_DLGRESETMARGIN, NULL, N_("Previous Tip"), 0L, (void *)(SHOWTIP_FORCESHOW | SHOWTIP_PREVTIP) }, { PD_BUTTON, (void*)ShowTip, "next", PDO_DLGHORZ, NULL, N_("Next Tip"), 0L, (void *)(SHOWTIP_FORCESHOW | SHOWTIP_NEXTTIP) }, { PD_TOGGLE, &showTipAtStart, "showatstart", PDO_DLGCMDBUTTON, tipLabels, NULL, BC_NOBORDER }}; @@ -86,7 +87,7 @@ static void CreateTipW( void ) char *filename; char * cp; - tipW = ParamCreateDialog( &tipPG, MakeWindowTitle(_("Tip of the Day")), _("Ok"), (paramActionOkProc)wHide, NULL, FALSE, NULL, F_CENTER, NULL ); + tipW = ParamCreateDialog( &tipPG, MakeWindowTitle(_("Tip of the Day")), _("Ok"), (paramActionOkProc)wHide, wHide, FALSE, NULL, F_RESIZE|F_CENTER, NULL ); /* open the tip file */ MakeFullpath(&filename, libDir, sTipF, NULL); @@ -167,7 +168,8 @@ void ShowTip( long flags ) } ParamLoadControls( &tipPG ); wTextClear( tipT ); - wPrefGetInteger( "misc", "tip-number", &tipNum, 0 ); + /* initial value is -1 which gets incremented 0 below */ + wPrefGetInteger( "misc", "tip-number", &tipNum, -1 ); if( flags & SHOWTIP_PREVTIP ) { if(tipNum == 0 ) @@ -202,7 +204,7 @@ static paramData_t aboutPLs[] = { { PD_MESSAGE, NULL, NULL, PDO_DLGNEWCOLUMN, NULL, NULL, BM_LARGE }, #define I_COPYRIGHT (2) #define COPYRIGHT_T ((wText_p)aboutPLs[I_COPYRIGHT].control) - { PD_TEXT, NULL, NULL, PDO_DLGRESIZE, &aboutTextData, NULL, BT_CHARUNITS } + { PD_TEXT, NULL, NULL, PDO_DLGRESIZE, &aboutTextData, NULL, BO_READONLY|BT_TOP|BT_CHARUNITS } }; static paramGroup_t aboutPG = { "about", 0, aboutPLs, sizeof aboutPLs/sizeof aboutPLs[0] }; @@ -217,13 +219,18 @@ void CreateAboutW( void *ptr ) if( !aboutW ) { aboutPLs[I_ABOUTDRAW].winData = wIconCreatePixMap( xtc_xpm ); ParamRegister( &aboutPG ); - aboutW = ParamCreateDialog( &aboutPG, MakeWindowTitle(_("About")), _("Ok"), (paramActionOkProc)wHide, NULL, FALSE, NULL, F_TOP|F_CENTER, NULL ); + aboutW = ParamCreateDialog( &aboutPG, MakeWindowTitle(_("About")), _("Ok"), (paramActionOkProc)wHide, wHide, FALSE, NULL, F_TOP|F_CENTER, NULL ); ParamLoadMessage( &aboutPG, I_ABOUTVERSION, sAboutProd ); wTextAppend( COPYRIGHT_T, DESCRIPTION ); wTextAppend( COPYRIGHT_T, "\n\nXTrackCAD is Copyright 2003 by Sillub Technology and 2017 by Bob Blackwell, Martin Fischer and Adam Richards." ); wTextAppend( COPYRIGHT_T, "\nIcons by: Tango Desktop Project (http://tango.freedesktop.org)"); + wTextAppend(COPYRIGHT_T, "\nSome icons by Yusuke Kamiyamane. Licensed under a Creative Commons Attribution 3.0 License."); wTextAppend( COPYRIGHT_T, "\nContributions by: Robert Heller, Mikko Nissinen, Timothy M. Shead, Daniel Luis Spagnol" ); wTextAppend( COPYRIGHT_T, "\nParameter Files by: Ralph Boyd, Dwayne Ward" ); +#ifdef WINDOWS + wTextAppend(COPYRIGHT_T, "\n"); + wTextAppend(COPYRIGHT_T, FreeImage_GetCopyrightMessage()); +#endif wTextAppend( COPYRIGHT_T, "\nCornu Algorithm and Implementation by: Raph Levien"); wTextAppend( COPYRIGHT_T, "\nuthash Copyright notice:" ); wTextAppend( COPYRIGHT_T, "\nCopyright (c) 2005-2015, Troy D. Hanson http://troydhanson.github.com/uthash/"); |