[Back to Index]

[00:04] <-- ccawley2011 left irc: Ping timeout: 260 seconds
[00:45] <-- noobineer left irc: Remote host closed the connection
[00:47] <-- TMM left irc: Remote host closed the connection
[00:56] --> noobineer joined #scummvm.
[01:02] <-- noobineer left irc: Max SendQ exceeded
[01:11] --> noobineer joined #scummvm.
[01:23] <-- noobineer left irc: Remote host closed the connection
[01:32] --> rootfather_ joined #scummvm.
[01:34] <-- rootfather|afk left irc: Ping timeout: 268 seconds
[01:47] --> DominusExult joined #scummvm.
[01:49] <-- Dominus left irc: Ping timeout: 260 seconds
[01:49] Nick change: DominusExult -> Dominus
[02:20] <-- linux_dr left irc: Quit: Connection closed for inactivity
[03:06] --> GitHub160 joined #scummvm.
[03:06] <GitHub160> [scummvm] criezy pushed 1 new commit to master: https://git.io/vpvRh
[03:06] <GitHub160> scummvm/master 5df28d6 Thierry Crozat: I18N: Regenerate translations data file
[03:06] GitHub160 (GitHub160@gateway/service/github.com/x-yattjkldahmumwhq) left #scummvm.
[03:28] --> GitHub120 joined #scummvm.
[03:28] <GitHub120> [scummvm] dreammaster pushed 1 new commit to master: https://git.io/vpv0a
[03:28] <GitHub120> scummvm/master 0922d44 Paul Gilbert: XEEN: Added differences introduced in Swords of Xeen
[03:28] GitHub120 (GitHub120@gateway/service/github.com/x-romzsamkxckebjhq) left #scummvm.
[03:46] <-- dreammaster left irc:
[04:50] <-- SylvainTV left irc: Ping timeout: 260 seconds
[04:57] --> GitHub44 joined #scummvm.
[04:57] <GitHub44> [scummvm] Strangerke pushed 1 new commit to master: https://git.io/vpvzG
[04:57] <GitHub44> scummvm/master f01af16 Strangerke: LILLIPUT: Fix a regresssion in scrollToViewportCharacterTarget(), some more renaming
[04:57] GitHub44 (GitHub44@gateway/service/github.com/x-rxpehqcxoqabfepl) left #scummvm.
[05:12] <-- Strangerke left irc: Ping timeout: 260 seconds
[06:07] <-- stroggoff left irc: Quit: Leaving
[06:10] Nick change: rootfather_ -> rootfather
[06:10] <-- rootfather left irc: Changing host
[06:10] --> rootfather joined #scummvm.
[06:10] #scummvm: mode change '+o rootfather' by ChanServ!ChanServ@services.
[06:12] --> _sev_ joined #scummvm.
[06:12] <-- _sev_ left irc: Changing host
[06:12] --> _sev_ joined #scummvm.
[06:12] #scummvm: mode change '+o _sev_' by ChanServ!ChanServ@services.
[06:39] --> waltervn joined #scummvm.
[06:39] #scummvm: mode change '+o waltervn' by ChanServ!ChanServ@services.
[06:39] <waltervn> morning
[06:52] <rootfather> morning :)
[07:02] <bonki> morning :)
[07:19] <madmoose> morning all
[07:26] --> SylvainTV joined #scummvm.
[07:26] #scummvm: mode change '+o SylvainTV' by ChanServ!ChanServ@services.
[07:31] <-- Drenn left irc: Ping timeout: 264 seconds
[07:32] <-- SylvainTV left irc: Read error: Connection reset by peer
[07:54] --> Joefish joined #scummvm.
[07:54] #scummvm: mode change '+v Joefish' by ChanServ!ChanServ@services.
[08:14] <Strangerke|work> hi guys :)
[08:15] <madmoose> hi Strangerke|work
[08:22] <-- LittleToonCat left irc: Remote host closed the connection
[08:28] --> _sev|work joined #scummvm.
[08:28] <-- _sev|work left irc: Changing host
[08:28] --> _sev|work joined #scummvm.
[08:28] #scummvm: mode change '+o _sev|work' by ChanServ!ChanServ@services.
[08:43] --> criezy|Work joined #scummvm.
[08:43] #scummvm: mode change '+o criezy|Work' by ChanServ!ChanServ@services.
[08:43] <criezy|Work> Good morning
[08:48] <Joefish> morning criezy|Work
[08:48] <rootfather> hi criezy|Work
[08:50] <-- Lightkey left irc: Ping timeout: 265 seconds
[08:51] <rootfather> criezy|Work, what's left to do is only fiddeling with the button positioning and wrapping around the copy-to-clipboard functionality with an SDL check :)
[08:57] <-- Joefish left irc: Quit: Joefish
[08:59] <criezy|Work> rootfather: great!
[08:59] <criezy|Work> But don't wrap around the copy-to-clipboard functionality with a SDL check.
[09:00] <criezy|Work> Instead you need to wrap it with a OSystem feature check. See for example https://github.com/scummvm/scummvm/blob/master/gui/widgets/editable.cpp#L189
[09:02] <rootfather> okay, sure
[09:02] <rootfather> can you tell me where's the difference?
[09:03] <rootfather> erm, well, seems reasonable if the copy-to-clipboard function gets ported to non-SDL platforms I guess
[09:03] --> Joefish joined #scummvm.
[09:03] #scummvm: mode change '+v Joefish' by ChanServ!ChanServ@services.
[09:03] --> Lightkey joined #scummvm.
[09:07] <criezy|Work> rootfather: Excatly. The clipboard functionalities may be present on non-SDL2 platforms.
[09:08] <-- _sev|work left irc: Quit: This computer has gone to sleep
[09:23] --> f2k joined #scummvm.
[09:25] --> _sev|work joined #scummvm.
[09:25] <-- _sev|work left irc: Changing host
[09:25] --> _sev|work joined #scummvm.
[09:25] #scummvm: mode change '+o _sev|work' by ChanServ!ChanServ@services.
[09:54] --> TMM joined #scummvm.
[09:54] #scummvm: mode change '+o TMM' by ChanServ!ChanServ@services.
[09:56] <-- waltervn left irc: Quit: Leaving
[10:09] <-- _sev|work left irc: Quit: This computer has gone to sleep
[10:29] <-- Tomaz^W left irc:
[10:34] <rootfather> criezy|Work https://img.static.lu/show/JEOeu8OOeJU1nLPD :)
[10:36] <criezy|Work> Nice!
[10:37] <criezy|Work> Although it looks like you have a bit too much space between the text and the button. You might have overestimated the height of the dialog.
[10:39] <rootfather> criezy|Work I completely copy-pasted most of the dialog calculations from the updater dialog, so this will be altered
[10:41] <rootfather> oh and I noticed that I wrapped the dialog message to 80 columns too which might be unnecessary
[10:42] <criezy|Work> If I remember correctly, the updater dialog has a selector for the update frequency below the text, so it probably keeps some space for it. which we don't need here.
[10:42] <criezy|Work> So that would explain this unneeded space.
[10:43] <rootfather> yeah, the updater dialog adds quite some lines after calculating the space needed solely for the main text widget
[10:48] <rootfather> would you recommend using style A or style B:
[10:48] <rootfather> style A: https://img.static.lu/show/SLHewfGLYhBzi7uX
[10:48] <rootfather> style B: https://img.static.lu/show/looLdC6azY1Eb7O0
[10:48] <rootfather> in B; I removed the .wordWrap(80) for the translated message
[10:52] <criezy|Work> Maybe don't wrap at 80 characters?
[10:52] <criezy|Work> I suspect this might also be easier to handle when you reduce the size of the ScummVM window.
[10:53] <criezy|Work> For example to 1x scaler (320 width) for which you cannot probably fit 80 characters and the wrapt at 80 together with the wrap at the window width might generate some uneexpected result.
[10:55] <criezy|Work> On the other hand not wrapping might result in a very wide dialog when using a big ScummVM window (for example in full screen OpenGL mode) and this might not be nice either.
[10:55] <criezy|Work> So I am not sure...
[10:58] <criezy|Work> You might want to not wrap at 80 characters, but limit the dialog width at MIN(screenW - 2 * 20, 500) for example.
[10:58] <criezy|Work> Try to play with a few ScummVM window size and see which option looks better.
[11:01] --> waltervn joined #scummvm.
[11:01] #scummvm: mode change '+o waltervn' by ChanServ!ChanServ@services.
[11:01] Nick change: Rasi -> Zukunft
[11:02] Nick change: Zukunft -> Rasi
[11:05] --> GitHub10 joined #scummvm.
[11:05] <GitHub10> [scummvm] Joefish pushed 1 new commit to master: https://git.io/vpvhd
[11:05] <GitHub10> scummvm/master 77c06fe Joseph-Eugene Winzer: SUPERNOVA: Removes unused variable
[11:05] GitHub10 (GitHub10@gateway/service/github.com/x-hiwkrnzaswqdkalz) left #scummvm.
[11:26] <-- waltervn left irc: Ping timeout: 276 seconds
[11:28] --> _sev|work joined #scummvm.
[11:28] <-- _sev|work left irc: Changing host
[11:28] --> _sev|work joined #scummvm.
[11:28] #scummvm: mode change '+o _sev|work' by ChanServ!ChanServ@services.
[11:28] <-- edheldil left irc: Remote host closed the connection
[11:29] --> Yuv422 joined #scummvm.
[11:31] <rootfather> criezy|Work, you wrote "We already have an API to open a URL in OSystem" - can you tell me where this resides?
[11:33] --> edheldil joined #scummvm.
[11:37] --> noobineer joined #scummvm.
[11:37] <-- noobineer left irc: Max SendQ exceeded
[11:40] <-- _sev|work left irc: Quit: This computer has gone to sleep
[11:40] --> _sev|work joined #scummvm.
[11:40] <-- _sev|work left irc: Changing host
[11:40] --> _sev|work joined #scummvm.
[11:40] #scummvm: mode change '+o _sev|work' by ChanServ!ChanServ@services.
[11:42] <-- _sev|work left irc: Client Quit
[11:42] --> GitHub195 joined #scummvm.
[11:42] <GitHub195> [scummvm] dreammaster pushed 2 new commits to master: https://git.io/vpffh
[11:42] <GitHub195> scummvm/master c92561c Paul Gilbert: XEEN: Fix Swords scripts using cmdReturn instead of cmdExit
[11:42] <GitHub195> scummvm/master 5cba33c Paul Gilbert: XEEN: Add script patch for chest in Swords Hart
[11:42] GitHub195 (GitHub195@gateway/service/github.com/x-rifleerivcecxcrx) left #scummvm.
[11:42] <criezy|Work> rootfather: https://github.com/scummvm/scummvm/blob/master/common/system.h#L1350
[11:42] --> _sev|work joined #scummvm.
[11:42] <-- _sev|work left irc: Changing host
[11:43] --> _sev|work joined #scummvm.
[11:43] #scummvm: mode change '+o _sev|work' by ChanServ!ChanServ@services.
[11:43] <criezy|Work> rootfather: And ou test if the feature is available in the same way as you would do for clipboard (but using kFeatureOpenUrl instead of kFeatureClipboardSupport obviously).
[11:50] --> Drenn joined #scummvm.
[12:39] <-- Drenn left irc: Read error: Connection reset by peer
[12:49] --> dreammaster joined #scummvm.
[12:49] #scummvm: mode change '+o dreammaster' by ChanServ!ChanServ@services.
[12:50] --> waltervn joined #scummvm.
[12:50] #scummvm: mode change '+o waltervn' by ChanServ!ChanServ@services.
[12:55] <-- _sev|work left irc: Quit: Leaving
[13:14] <rootfather> criezy|Work, regarding the URL opening part - the problem is that http://scummvm.org/newticket will fail if the user is not logged in
[13:15] <rootfather> is it possible to create a link linke http://bugs.scummvm.org/reportgame that allows creating a ticket with fixed category and priority without needed to be logged in?
[13:19] <criezy|Work> rootfather: I don't know what the Trac capabilities are. Maybe wjp would know.
[13:19] <criezy|Work> And sometimes websites in such a situation would redirect you to a login page, and once you have logged in to the newticket page, but here it is not the case which makes it fail in a non clear way :-(
[13:22] <rootfather> yeah that's the problem I see here
[13:23] <rootfather> if there would be something like "oh nice you want to create a ticket, but please let me see your password", this would be no issue at all
[13:25] <-- Yuv422 left irc: Quit: Yuv422
[13:25] <bonki> rootfather: if you surf to /newticket without being logged in you get "TICKET_CREATE privileges are required to perform this operation on Ticket #None. You don't have the required permissions."
[13:25] <rootfather> bonki: and this is what criezy calls failing in a non clear way ;)
[13:26] <bonki> I wouldn't call it non-clear :)
[13:26] <bonki> but yet, you can't seem to just feed it some GET params without being logged in it seems
[13:26] <bonki> yes*
[13:26] <bonki> or no, rather
[13:26] <bonki> heh
[13:28] <bonki> rootfather: btw, do you have a minute?
[13:28] <rootfather> yep sure
[13:28] <rootfather> btw, _("All necessary information about your game has been copied into the clipboard") - "has" or "have"? :D
[13:28] <bonki> great, I'll just grab a quick coffee and PM you in a sec
[13:28] <bonki> has
[13:29] --> ccawley2011 joined #scummvm.
[13:30] --> _sev|work joined #scummvm.
[13:30] #scummvm: mode change '+o _sev|work' by ChanServ!ChanServ@services.
[13:30] <criezy|Work> I actually find it pretty clear, but for some reasons the first time I tried I landed on the homepage and not on the page with this message.
[13:32] <criezy|Work> Although clicking on the "You can do so now" directs you to an error page "No handler matched request to /login" instead of login page. So this is not ideal :-P
[13:33] <rootfather> yep
[13:35] <bonki> criezy|Work: agreed :D
[13:36] <rootfather> and pre-filling the forms with the appropriate information would be only possible using the curl libs, right?
[13:38] <criezy|Work> You don't neek the curl lib to allow pre-filling the Trac forms. You can do so with query items in the URL according to Google.
[13:39] <criezy|Work> rootfather: See https://trac.edgewall.org/wiki/TracTickets
[13:40] <criezy|Work> And in particular the Preset Values for New Tickets toward the bottom of the page.
[13:43] <rootfather> holy shit
[13:43] <rootfather> https://bugs.scummvm.org/newticket?summary=New Game entry&description=New game data goes here!
[13:44] <rootfather> it works :D
[13:46] <rootfather> okay this involves splitting apart the generated reportData message, but I think I know what to do \o/
[14:12] <rootfather> almost there...
[14:30] <rootfather> criezy|Work, do we have a function to replace a character in a String with another one? like replacing all the \n from the reportData to \0A for passing to the bugtracker - otherwise we have yet another message to be built by advancedDetector
[14:36] <-- _sev|work left irc: Quit: This computer has gone to sleep
[14:36] <criezy|Work> rootfather: https://github.com/scummvm/scummvm/blob/master/common/str.h#L412
[14:36] <-- f2k left irc: Quit: Leaving
[14:37] <rootfather> you could be the title of a book by O'Reilly...
[14:37] <rootfather> "Criezy - The Living Absolute ScummVM Programmer's Reference"
[14:37] <rootfather> :D
[14:46] --> _sev|work joined #scummvm.
[14:46] #scummvm: mode change '+o _sev|work' by ChanServ!ChanServ@services.
[14:47] <-- _sev|work left irc: Client Quit
[14:48] <criezy|Work> rootfather: I don't know most of it. I just know where to look.
[14:49] --> jamm joined #scummvm.
[15:21] --> GitHub55 joined #scummvm.
[15:21] <GitHub55> [scummvm] dreammaster pushed 1 new commit to master: https://git.io/vpfge
[15:21] <GitHub55> scummvm/master cdfe8c8 Paul Gilbert: XEEN: Fix loading Swords blacksmiths
[15:21] GitHub55 (GitHub55@gateway/service/github.com/x-fuflcsydajwtbbrr) left #scummvm.
[15:50] --> GitHub141 joined #scummvm.
[15:50] <GitHub141> [scummvm] rootfather opened pull request #1160: GUI: Implement an "Unknown game dialog" (master...unknown-game-dialog) https://git.io/vpfwU
[15:50] GitHub141 (GitHub141@gateway/service/github.com/x-zmagqddxydazqjua) left #scummvm.
[15:54] <rootfather> aaand my first useful scummvm contribution is there \o/
[15:55] <bonki> rootfather: don't say that, all your contributions are useful :)
[15:56] <madmoose> rootfather: \(^~^)/
[15:56] <-- TMM left irc: Quit: Ex-Chat
[15:59] --> ny00123 joined #scummvm.
[16:01] --> _sev|work joined #scummvm.
[16:01] <-- _sev|work left irc: Changing host
[16:01] --> _sev|work joined #scummvm.
[16:01] #scummvm: mode change '+o _sev|work' by ChanServ!ChanServ@services.
[16:02] <-- _sev|work left irc: Client Quit
[16:02] <rootfather> thanks all
[16:03] <criezy|Work> rootfather: Thank you!
[16:03] <criezy|Work> I will review this later today when I am back home.
[16:24] <-- klusark left irc: Quit: quit
[16:40] --> rootfather|afk joined #scummvm.
[16:42] <-- rootfather left irc: Ping timeout: 264 seconds
[16:46] Nick change: rootfather|afk -> rootfather
[16:46] <-- rootfather left irc: Changing host
[16:46] --> rootfather joined #scummvm.
[16:46] #scummvm: mode change '+o rootfather' by ChanServ!ChanServ@services.
[16:47] --> ajax16384 joined #scummvm.
[16:47] #scummvm: mode change '+o ajax16384' by ChanServ!ChanServ@services.
[16:51] <-- dreammaster left irc:
[16:56] --> LittleToonCat joined #scummvm.
[17:04] --> Farmboy0 joined #scummvm.
[17:04] <-- Farmboy0 left irc: Changing host
[17:04] --> Farmboy0 joined #scummvm.
[17:05] <-- jamm left irc: Ping timeout: 264 seconds
[17:10] --> Begasus joined #scummvm.
[17:14] --> _sev|work joined #scummvm.
[17:14] <-- _sev|work left irc: Changing host
[17:14] --> _sev|work joined #scummvm.
[17:14] #scummvm: mode change '+o _sev|work' by ChanServ!ChanServ@services.
[17:14] --> GitHub92 joined #scummvm.
[17:14] <GitHub92> [scummvm-tools] sev- pushed 2 new commits to master: https://git.io/vpfDy
[17:14] <GitHub92> scummvm-tools/master ea4eb9b Eugene Sandulenko: TOOLS: Added support for other files in ru and en versions of Prince converter
[17:14] <GitHub92> scummvm-tools/master 3b4c602 Eugene Sandulenko: TOOLS: Add support for Polish in prince converter
[17:14] GitHub92 (GitHub92@gateway/service/github.com/x-xkiqqlrroqslmnje) left #scummvm.
[17:19] --> Begas_VBox joined #scummvm.
[17:32] <-- _sev|work left irc: Quit: This computer has gone to sleep
[17:35] --> _sev|work joined #scummvm.
[17:35] <-- _sev|work left irc: Changing host
[17:35] --> _sev|work joined #scummvm.
[17:35] #scummvm: mode change '+o _sev|work' by ChanServ!ChanServ@services.
[17:36] <-- _sev|work left irc: Client Quit
[17:37] <-- Begas_VBox left irc: Ping timeout: 264 seconds
[17:37] <-- Begasus left irc: Ping timeout: 255 seconds
[17:42] <-- |Cable| left irc: Ping timeout: 265 seconds
[17:54] --> girafe joined #scummvm.
[17:55] --> |Cable| joined #scummvm.
[18:10] --> stroggoff joined #scummvm.
[18:11] --> dreammaster joined #scummvm.
[18:11] #scummvm: mode change '+o dreammaster' by ChanServ!ChanServ@services.
[18:18] <-- |Cable| left irc: Ping timeout: 240 seconds
[18:30] --> |Cable| joined #scummvm.
[18:33] --> SylvainTV joined #scummvm.
[18:33] #scummvm: mode change '+o SylvainTV' by ChanServ!ChanServ@services.
[18:41] --> mwillcock joined #scummvm.
[18:51] <-- criezy|Work left irc: Ping timeout: 260 seconds
[19:21] --> criezy joined #scummvm.
[19:21] #scummvm: mode change '+o criezy' by ChanServ!ChanServ@services.
[19:43] --> Strangerke joined #scummvm.
[19:45] --> _sev|work joined #scummvm.
[19:45] <-- _sev|work left irc: Changing host
[19:45] --> _sev|work joined #scummvm.
[19:45] #scummvm: mode change '+o _sev|work' by ChanServ!ChanServ@services.
[19:45] --> GitHub67 joined #scummvm.
[19:45] <GitHub67> [scummvm-tools] sev- pushed 1 new commit to master: https://git.io/vpJvw
[19:45] <GitHub67> scummvm-tools/master b1e116e Eugene Sandulenko: TOOLS: Support for German Prince in converter
[19:45] GitHub67 (GitHub67@gateway/service/github.com/x-yctxtyptufwynlnz) left #scummvm.
[19:47] #scummvm: mode change '+o Strangerke' by ChanServ!ChanServ@services.
[19:48] <-- _sev|work left irc: Client Quit
[19:56] Nick change: _sev_ -> _sev
[20:06] <-- Joefish left irc: Ping timeout: 265 seconds
[20:11] <rsn8887> That report button... will it work if platform has a working SDL_net port, or is something else needed?
[20:12] <rsn8887> To be more specific: What is required for ScummVM to access the internet succesfully? Is it just a working SDL_net?
[20:12] <rsn8887> Or is there more to it?
[20:12] <-- ccawley2011 left irc: Ping timeout: 260 seconds
[20:13] --> ccawley2011 joined #scummvm.
[20:14] <_sev> rsn8887: no, it uses system's caller
[20:14] <rsn8887> I see...
[20:14] <_sev> not all backends implement it
[20:15] <rsn8887> Ok, I understand the buttons will not even show if the backend doesn't implement it, which makes sense.
[20:15] <bonki> yep
[20:16] <rootfather> and I'm in desperate need of a way to check if the GUI is running, but with a value that's available *without* the GUI being loaded :D
[20:16] <_sev> rootfather: err, can you elaborate?
[20:17] <rootfather> currently, if either --detect or --add is invoked via the command line, scummvm crashes as soon as it hits the point where it should load the unknownGameDialog.
[20:17] <_sev> ah, GUI as the system GUI?
[20:17] <rootfather> therefore I want to wrap the dialog inside a check whether the GUI is running
[20:17] <rootfather> GUI as in scummvm gui/launcher
[20:17] <_sev> ah, that
[20:17] <_sev> then
[20:17] <_sev> g_gui.isActive()
[20:18] <rootfather> aaaaaaah, thanks
[20:18] <rootfather> I tried with if (GUI::GuiManager::instance()._launched) which results in a segfault
[20:20] <rootfather> mh, g_gui.isActive() segfaults here too...
[20:20] <rootfather> // Show the UnknownGameDialog and print the translated unknown game information
[20:20] <rootfather> if (g_gui.isActive()) {
[20:20] <rootfather> GUI::UnknownGameDialog dialog(report, reportTranslated, bugtrackerAffectedEngine);
[20:20] <rootfather> dialog.runModal();
[20:20] <rootfather> } else {
[20:20] <rootfather> warning("Foo");
[20:20] <rootfather> }
[20:20] <rootfather> and as output I get "Segmentation fault" instead of "WARNING: Foo" :D
[20:20] <_sev> then do
[20:21] <_sev> if (g_gui && g_gui.isActive())
[20:22] <rootfather> error: no match for 'operator&&' (operand types are 'GUI::GuiManager' and 'bool')
[20:23] <_sev> ugh
[20:23] <_sev> ah, wait
[20:24] <_sev> you're getting it when trying to run from the command line?
[20:24] --> rootfather|afk joined #scummvm.
[20:25] Nick change: rootfather|afk -> rootfather_
[20:25] <_sev> did you see my question?
[20:25] <_sev> are you getting it when trying to run scummvm from the command line?
[20:26] <rootfather_> yep
[20:26] <rootfather_> running from the scummvm gui works as expected
[20:26] <rootfather_> just the cli freaks out
[20:26] <_sev> then it is too early, GUI has not yet been instantiated
[20:26] <_sev> let me think
[20:27] <bonki> shouldn't GUI::GuiManager::instance() work then?
[20:27] <-- rootfather left irc: Ping timeout: 268 seconds
[20:28] <criezy> That would create the instance, which I don't think is what we want here.
[20:28] Nick change: rootfather_ -> rootfather
[20:28] <-- rootfather left irc: Changing host
[20:28] --> rootfather joined #scummvm.
[20:28] #scummvm: mode change '+o rootfather' by ChanServ!ChanServ@services.
[20:28] <criezy> Maybe add a static bool hasInstance() in the Singleton class?
[20:28] <_sev> could work
[20:34] --> Joefish joined #scummvm.
[20:34] #scummvm: mode change '+v Joefish' by ChanServ!ChanServ@services.
[20:34] <rootfather> what's the Singleton class?
[20:35] <bonki> GuiManager
[20:37] <criezy> rootfather: see common/singleton.h
[20:38] <rootfather> yeah I looked at it, but I understand absolutely nothing :D
[20:40] <-- SylvainTV left irc: Quit: User pushed the X - because it's Xtra, baby
[20:40] --> SylvainTV joined #scummvm.
[20:40] #scummvm: mode change '+o SylvainTV' by ChanServ!ChanServ@services.
[20:42] <criezy> rootfather: for now try to add around line 62 in common/singleton.h the hasInstance() as in https://gist.github.com/criezy/bb797592fd7549f57a8a4857085c9dc8
[20:42] <criezy> Then before using the dialog do a test on if (GUI::GuiManager::hasInstance() && g_gui.isActive())
[20:45] <rootfather> let me try this
[20:49] <rootfather> yeah, it works!
[20:52] <rootfather> is the change in common/singleton.h ready to be commited or is this just a workaround for now?
[20:53] <_sev> the gist is gone, so I cannot see.
[20:54] <_sev> but I believe it is something very simple so yes, it can go as is
[20:54] <rootfather> _sev: https://gist.github.com/rootfather/5610d6f86082b56b219052dbb8c26b38
[20:55] <_sev> yes, this is what I thought it is. That is a good change
[20:55] <rootfather> commiting then to my branch
[21:10] --> TMM joined #scummvm.
[21:10] <-- TMM left irc: Changing host
[21:10] --> TMM joined #scummvm.
[21:10] #scummvm: mode change '+o TMM' by ChanServ!ChanServ@services.
[21:24] <rootfather> I think that's it for today - see you tomorrow :)
[21:27] --> klusark joined #scummvm.
[21:32] <bonki> rootfather: see you!
[21:33] <bonki> I'll also hit the sack early
[21:33] <bonki> nitey
[21:33] <criezy> See you tomorrow. I am currently reviewing your PR, so you will have some new comments when you wake up :-P
[21:33] <bonki> haha
[21:39] <-- waltervn left irc: Quit: Leaving
[21:50] <-- mwillcock left irc: Quit: Leaving
[21:51] <-- _sev left irc: Ping timeout: 256 seconds
[21:52] <-- bonki left irc: Remote host closed the connection
[21:54] --> bonki joined #scummvm.
[21:54] #scummvm: mode change '+o bonki' by ChanServ!ChanServ@services.
[21:58] <-- ny00123 left irc: Quit: Leaving
[21:59] <-- macdude22 left irc: Ping timeout: 245 seconds
[22:08] <-- girafe left irc: Read error: Connection reset by peer
[22:13] <-- Dominus left irc: Read error: Connection reset by peer
[22:16] --> Dominus joined #scummvm.
[22:26] <rsn8887> So just to make sure: a merge-commit, e.g. created via "git pull upstream master" is a commit that shows 2 parents in git log. Is this just a summary list of changes, but the actual changes are recorded in regular commits, shown at earlier times by git log?
[22:26] <rsn8887> It certainly seems that way to me.
[22:30] <-- Mia left irc: Read error: Connection reset by peer
[22:35] --> rootfather_ joined #scummvm.
[22:38] <-- rootfather left irc: Ping timeout: 240 seconds
[22:45] <-- Farmboy0 left irc: Remote host closed the connection
[22:49] <-- ajax16384 left irc: Quit: Leaving
[22:50] <-- Joefish left irc: Ping timeout: 265 seconds
[22:54] <-- ccawley2011 left irc: Ping timeout: 260 seconds
[22:55] <rsn8887> ok so it definitely is that. I wish the git documentation was better.
[23:00] <-- criezy left irc: Quit: criezy
[23:01] --> ccawley2011 joined #scummvm.
[23:04] <Dark-Star> rsn8887: this is how it works, yes. what documentation did you check? the git-merge manual page (note that git pull is just git fetch followed by git merge) explains this quite in detail (see the sections on "fast-forward merge" and "true merge")
[23:06] <Dark-Star> you can force an ff-commit (if possible) by using "git merge --ff-only" (or "git pull --ff-only"), or the other way round (don't do fast-forward merges, always generate explicit merge commits) by using "--no-ff"
[23:06] <Dark-Star> s/ff-commit/ff-merge/
[23:11] <Dark-Star> usually you want to avoid merge-commits as they make it harder to separate "true" merges of different trees from merges that happened just because you had unpushed commits in your local tree
[23:19] <rsn8887> Dark-Star: that is the documentation I checked. The documentation says absolutely nothing about how the merge is presented in the history. Neither does the git log documentation. In no way do the documents refer to a "merge-commit" and that it shows all the changes AGAIN.
[23:21] <-- klusark left irc: Quit: quit
[23:23] <rsn8887> So the git documentation online is literally just a collection of man-pages.
[23:23] <Dark-Star> a merge commit doesn't show the changes "again", that's just how github presents it. If you're used to svn or cvs, using git can be a bit tricky at first because it does things so different to those other systems. But as soon as you've wrapped your head around it, the concepts will work for you instead of you struggling to fight against them
[23:24] <Dark-Star> the first sentence in the section "TRUE MERGE" on this page https://git-scm.com/docs/git-merge describes what a "merge commit" is
[23:24] <Dark-Star> "Except in a fast-forward merge (see above), the branches to be merged must be tied together by a merge commit that has both of them as its parents."
[23:25] <Dark-Star> a merge commit is a way for git to keep track of the two sources that are merged together. it's basically how the "history graph" knows when two lines of commits merge together again. Without a merge commit there would be no way of maintaining that relationship
[23:26] <Dark-Star> and there are tons of git tutorials on the web, once you've started to understand the basics, the "collection of man pages" is all you really need on a day-to-day basis
[23:26] <rsn8887> That second paragraph is not in the docs though. I am missing an explanation that all commits from both branches are present in the commit history of the merge branch PLUS one additional commit with two parents.
[23:27] <rsn8887> and that last commit with two parents contains information of what was merged into what, but actual changes are still in the original commits.
[23:28] <Dark-Star> yeah, that's just some shortcut that github does so that you don't have to scroll down the list of commits to find the original ones that were merged
[23:28] <Dark-Star> It's probably somewhere in their documentation :)
[23:29] <rsn8887> Dark-Star: well the git-merge docs also sound that way (at the top): "and record the result in a new commit along with the names of the two parent commits and a log message from the user describing the changes."
[23:30] --> klusark joined #scummvm.
[23:31] <rsn8887> That sounds like the merge-commit contains the changes, not the individual commits. I mean those man-pages are sometimes very misleading. In addition, they seem to just contain randomly arranged bits of information with no logical flow. For example the arguments are listed just in some random sequence.
[23:31] <Dark-Star> "record the result" just means it stores the end result of the merge somewhere. and to store it you need a commit. The Commit "H" in the ASCII image is that merge commit. The "names" of the parent commits are just their hash, and the log message is that the user supplies. nowhere does it say that the commits are "recorded" or "stored" a second time :)
[23:33] <Dark-Star> the arguments are listed, as is common for man pages, roughly in the order of how often they will be used. Those that you use most appear on top, while the more exotic ones are further down. This is standard practice in any (good) man page
[23:34] <rsn8887> Maybe it is just me then, but I truly hate all man-pages. I don't think I have ever read a man-page and quickly found the information I was looking for. Most of the time I am looking for a simple, common example, and it is nowhere.
[23:34] <Dark-Star> and again, the man pages are not meant as a beginner's introduction to git. they are there if you already know what you're searching for. there are many good git tutorials out there (I think github has a good one linked somewhere)
[23:34] <Dark-Star> you should maybe start with a written tutorial first. there are even interactive ones where you can try the git commands while reading about them
[23:35] <rsn8887> It seems like the useful information is hidden in a vast collection of details and no attempt is made to distinguish minutious details from general principles and behavior.
[23:35] <rsn8887> the git-merge man page contains a whopping THREE examples with one sentence explanation each.
[23:35] <Dark-Star> git can be intimidating at first (it took me quite a while to get used to it, having used svn and cvs extensively before) but after getting over the initial "bump" (by reading a few tutorials and best practices etc.) everything will appear very logical and you will never understand why you put up with svn/cvs before :)
[23:38] <rsn8887> Yes I am already there, I love git. I just despise the documentation. For example the other day I was trying to figure out submodules. The documentation here: https://git-scm.com/book/en/v2/Git-Tools-Submodules is stunningly unreadable.
[23:40] <rsn8887> And basically that doc page tells me: Stay away from submodules, they are unusable, make everybodies life very hard, and are confusing.
[23:40] <Dark-Star> yeah, that's actually what I figured as well, even without reading the manpage ;-)
[23:41] <Dark-Star> I think they were implemented because subversion has something similar, and people wanted that feature to migrate from svn->git
[23:42] <-- ced117 left irc: Ping timeout: 255 seconds
[23:44] --> ced117 joined #scummvm.
[23:46] <rsn8887> Anyways, now I just keep a long textfile with my own git examples (the ones missing from the man-pages), and I am pretty happy with git.
[00:00] --- Tue Apr 17 2018