[Home] [Downloads] [Search] [Help/forum]

Gammon Software Solutions forum

See www.mushclient.com/spam for dealing with forum spam. Please read the MUSHclient FAQ!

[Folder]  Entire forum
-> [Folder]  MUSHclient
. -> [Folder]  Suggestions
. . -> [Subject]  Is it possible for the GUI to be updated?
Home  |  Users  |  Search  |  FAQ
Username:
Register forum user name
Password:
Forgotten password?
(New message)
Subject: Is it possible for the GUI to be updated?
Name:
Your forum user name.
Register forum user name
Password:
Your forum password.
Forgotten password?
Message:
Message to be posted (in English, please).
Forum codes:
Check this if your message uses 'forum codes' or templates (auto-detected for new posts).
Forum codes Templates

Save this message ...

Subject review (reverse sequence)

Pages: 1  2  3 4  

Posted by Worstje   Netherlands  (867 posts)  [Biography] bio
Date Sun 26 Sep 2010 09:50 PM (UTC)  [ quote  ]

Amended on Sun 26 Sep 2010 09:51 PM (UTC) by Worstje

Message
Nick Gammon said:

And this is why I like to see what the commit does, not blindly type in "git merge 349823987542" and hope everything is how I want it.


Looking at the git-merge help file, I think you might want to try the --no-commit --stat parameters. That will apply the merge, yet not commit, and show a diff afterwards. If the diff isn't good enough that way, or you forget to specify it, you can probably be more effective using 'git diff --staged' which shows the changes that would be committed.

That'd make the command: git merge 349823987542 --no-commit --stat

Alternatively, you could save yourself some options, and look into the merge.stat configuration option.
[Go to top] top
Posted by Nick Gammon   Australia  (18,772 posts)  [Biography] bio   Forum Administrator
Date Sun 26 Sep 2010 09:41 PM (UTC)  [ quote  ]
Message
Twisol said:

No stigma attached, but why aren't you using git merge or git pull for these changes? Personally, I trust git a little bit more than I trust copypasta.


You may trust it more, but I have had some odd error messages from it when attempting just that. And when I see one or two line changes, it seems easier to just copy them than try to do a git fetch, git merge or git cherry-pick, and then check I got what I wanted and no more.

Worstje said:

According to a bit of debugging I just did with Twisol who couldn't get stuff to work, you did not fix it. Probably some git commit juggling that went wrong somehow.


Yes, well I fixed it and now it got put back. As you say, probably one of those commits did it.

And this is why I like to see what the commit does, not blindly type in "git merge 349823987542" and hope everything is how I want it.
- Nick Gammon

www.gammon.com.au, www.mushclient.com
[Go to top] top
Posted by Worstje   Netherlands  (867 posts)  [Biography] bio
Date Sun 26 Sep 2010 07:43 PM (UTC)  [ quote  ]
Message
Nick Gammon said:

I fixed it, thanks.


According to a bit of debugging I just did with Twisol who couldn't get stuff to work, you did not fix it. Probably some git commit juggling that went wrong somehow.
[Go to top] top
Posted by Twisol   USA  (2,229 posts)  [Biography] bio
Date Sun 26 Sep 2010 09:39 AM (UTC)  [ quote  ]
Message
No stigma attached, but why aren't you using git merge or git pull for these changes? Personally, I trust git a little bit more than I trust copypasta.
'Soludra' on Achaea

Blog: http://jonathan.com/
GitHub: http://github.com/Twisol
[Go to top] top
Posted by Nick Gammon   Australia  (18,772 posts)  [Biography] bio   Forum Administrator
Date Sun 26 Sep 2010 06:45 AM (UTC)  [ quote  ]
Message
I incorporated those - maybe check I got it right, as I copied and pasted a bit.
- Nick Gammon

www.gammon.com.au, www.mushclient.com
[Go to top] top
Posted by Worstje   Netherlands  (867 posts)  [Biography] bio
Date Sun 26 Sep 2010 05:42 AM (UTC)  [ quote  ]
Message
I made two more commits to my theming branch, both of which fix ugly graphical glitches in the world properties screen.

To my knowledge this concludes the last of the graphical glitches MUSHclient is exhibiting. If anyone knows of any other graphical glitches, feel free to point them out and I'll do about them what I can.
[Go to top] top
Posted by Nick Gammon   Australia  (18,772 posts)  [Biography] bio   Forum Administrator
Date Sat 25 Sep 2010 10:18 AM (UTC)  [ quote  ]
Message
I fixed it, thanks.
- Nick Gammon

www.gammon.com.au, www.mushclient.com
[Go to top] top
Posted by Worstje   Netherlands  (867 posts)  [Biography] bio
Date Sat 25 Sep 2010 10:07 AM (UTC)  [ quote  ]

Amended on Sat 25 Sep 2010 10:29 AM (UTC) by Worstje

Message
Regarding your commit... I took a bit closer look...

You'll want:

#if _MSC_VER >= 1400


since that checks for minimum version MSVC 2005. Likewise, the #endif has a bit of a confusing comment regarding version 1200?
[Go to top] top
Posted by Worstje   Netherlands  (867 posts)  [Biography] bio
Date Fri 24 Sep 2010 10:53 PM (UTC)  [ quote  ]

Amended on Fri 24 Sep 2010 10:54 PM (UTC) by Worstje

Message
You're completely right. I was too impatient to wait for yet another compile after I tested with and without the fixes, and removed the 'def' part there in my hurry. Nice catch, and fixed in my repo. :)
[Go to top] top
Posted by Nick Gammon   Australia  (18,772 posts)  [Biography] bio   Forum Administrator
Date Fri 24 Sep 2010 10:47 PM (UTC)  [ quote  ]
Message
I had something similar. However I think:


#ifdef _MSC_VER >= 1400


should be:


#if _MSC_VER >= 1400


#ifdef _MSC_VER asks if _MSC_VER is defined or not (true or false).

#if _MSC_VER >= 1400 tests its value.
- Nick Gammon

www.gammon.com.au, www.mushclient.com
[Go to top] top
Posted by Worstje   Netherlands  (867 posts)  [Biography] bio
Date Fri 24 Sep 2010 10:23 PM (UTC)  [ quote  ]

Amended on Fri 24 Sep 2010 10:27 PM (UTC) by Worstje

Message
Check my latest commit, I think I fixed things.

Our fix amounts to the same thing, although I like mine more. I specified my fix by specifically checking for IDC_BULB and IDC_STATIC instead as those are the ones needing special treatment, leaving the default case to be clearly visible. (I had failed to recognize that apparently checkboxes are also considered static controls.)

The pragmas seem to be the recommended way to generate a manifest. I took them from a fresh MSVC project after I saw some website suggest to put them in the stdafx.h, and the site was right - my MSVC autogenerates such lines in the stdafx.h file by default.

[Go to top] top
Posted by Nick Gammon   Australia  (18,772 posts)  [Biography] bio   Forum Administrator
Date Fri 24 Sep 2010 10:08 PM (UTC)  [ quote  ]
Message
Worstje said:

I'll look into the proper compiler ifdefs, I am not sure which compiler introduced that flag however so it might take some figuring out.


What is it achieving? It looks on the face of it, that if you have the manifest file there, it is checking that you have the appropriate common dialog control DLL installed. Maybe some warning to delete the manifest file if the screen looks crappy?
- Nick Gammon

www.gammon.com.au, www.mushclient.com
[Go to top] top
Posted by Nick Gammon   Australia  (18,772 posts)  [Biography] bio   Forum Administrator
Date Fri 24 Sep 2010 10:06 PM (UTC)  [ quote  ]

Amended on Fri 24 Sep 2010 10:07 PM (UTC) by Nick Gammon

Message
This seems to fix it:


HBRUSH CTipDlg::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor)
{
  if (pWnd->GetDlgCtrlID() == IDC_TIPSTRING)
    return (HBRUSH)GetStockObject(WHITE_BRUSH);
  else if (pWnd->GetDlgCtrlID() == IDC_STARTUP)
  	return CDialog::OnCtlColor(pDC, pWnd, nCtlColor);
  else if (nCtlColor == CTLCOLOR_STATIC)
    /* Visual styles enabled causes the things we draw in our WM_PAINT
    * to get cleared (and not redrawn) if we do not use a hollow brush here.
    * Likely the default behaviour differs when using theming. -JW */
    return (HBRUSH)GetStockObject(HOLLOW_BRUSH);

	return CDialog::OnCtlColor(pDC, pWnd, nCtlColor);
}

- Nick Gammon

www.gammon.com.au, www.mushclient.com
[Go to top] top
Posted by Worstje   Netherlands  (867 posts)  [Biography] bio
Date Fri 24 Sep 2010 10:05 PM (UTC)  [ quote  ]
Message
I'll look into the proper compiler ifdefs, I am not sure which compiler introduced that flag however so it might take some figuring out.

Regarding the other glitch - weird, I am not getting that drawing glitch of the checkbox on Windows 7, making it kinda hard to test against that. I have however seen it mentioned elsewhere... let me see if I can remember where.
[Go to top] top
Posted by Nick Gammon   Australia  (18,772 posts)  [Biography] bio   Forum Administrator
Date Fri 24 Sep 2010 09:56 PM (UTC)  [ quote  ]

Amended on Fri 24 Sep 2010 09:57 PM (UTC) by Nick Gammon

Message
OK testing it is...

First, while the Tip Of The Day looks better, now I get this:




Second, with the suggested pragmas there I get:


accelerators.obj : warning LNK4044: unrecognized option "manifestdependency:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='x86' publicKeyToken='6595b64144ccf1df' language='*'"; ignored
ActivityDoc.obj : warning LNK4044: unrecognized option "manifestdependency:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='x86' publicKeyToken='6595b64144ccf1df' language='*'"; ignored
ansi.obj : warning LNK4044: unrecognized option "manifestdependency:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='x86' publicKeyToken='6595b64144ccf1df' language='*'"; ignored
art.obj : warning LNK4044: unrecognized option "manifestdependency:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='x86' publicKeyToken='6595b64144ccf1df' language='*'"; ignored
chatlistensock.obj : warning LNK4044: unrecognized option "manifestdependency:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='x86' publicKeyToken='6595b64144ccf1df' language='*'"; ignored
...


308 Warnings.

Any suggestions, apart from simply suppressing them?

It appears to look good apart from that.

- Nick Gammon

www.gammon.com.au, www.mushclient.com
[Go to top] top

The dates and times for posts above are shown in Universal Co-ordinated Time (UTC).

To show them in your local time you can join the forum, and then set the 'time correction' field in your profile to the number of hours difference between your location and UTC time.

12,651 views.

This is page 3, subject is 4 pages long:  [Previous page]  1  2  3 4  [Next page]

[Reply to this subject]  Reply to this subject   [New subject]  Start a new subject   [Refresh] Refresh page

Go to topic:           Search the forum

[Go to top] top

[Home]

Written by Nick Gammon - 5K

Comments to: Gammon Software support
[RH click to get RSS URL] Forum RSS feed ( http://www.gammon.com.au/rss/forum.xml )

[Best viewed with any browser - 2K]    [Internet Contents Rating Association (ICRA) - 2K]    [Web site powered by FutureQuest.Net]