| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Dunno if necessary, but they came up in the previous debugging session,
so just do it...
|
|
|
|
|
|
|
|
|
|
|
|
| |
Prevent crash when trying to convert a file to png. This was a hard one.
After checking into detached QT-Containers I finally realized that
convertArchivefileToPng was the culprit, because ImageMagick::read
exited with an "Unsupported marker type 0x09" execption.
After some more investigation with convert, or magick convert these
days, I found out that they could be ignored. Yes, it's a big hammer,
but if it still fails after trying to convert, just return if still
don't have a valid image.
|
|
|
|
| |
... instead of the viewer
|
|
|
|
|
|
|
|
|
| |
This is a huge commit. Changes:
* Obviously, make it compile
* Make it run (only scarcely tested)
* get rid of most of clang's warnings
Let's see what surprises are in store...
|
| |
|
| |
|
|
|
|
| |
Set it to 9999. While at it, remove some dead code and fix includes.
|
|
|
|
|
|
|
|
| |
Get the QGraphicsItems right (I hope), and use auto where applicable.
Let the compiler do the hard work.
Also use type-safe connect syntax, fix nullptr warnings and weed out
foreach.
|
|
|
|
|
| |
Don't assume we know what color ought to use. Ask the palette where
applicable, but keep the modified configuration options.
|
|
|
|
|
| |
Create separate files for MappingData and MappingTreeResultModel.
Hopefully no functional changes.
|
|
|
|
|
| |
Split up all the classes in mappingtreewidget into separate files to
make editing easier.
|
|
|
|
|
|
|
| |
The journey started innocent enough, but turned out to be a commit that
should have been severals. In the end, the picture archive has no
menuBar() any more, as expected, but it's also impossible to call the
slide dialog. Will fix that soon.
|
|
|
|
|
| |
Bail out if we have FT_ORIGIN. This file will never be present. Also
check harder what title to set in pictureviewer2.cpp, if any.
|
|
|
|
|
|
|
|
|
|
|
|
| |
Don't access FileName in constructWindowTitle when we don't have a file
at mCurPos. That's what crashed us randomly!
Also (yes, I know, should be a separate commit) fix warnings about
implicit fallthru's in switch statements. The one in SmDirModel actually
was a bug, the one in tabChanged is just a nuisance.
Also (again), shuffle header inclusion in SmGlobals so Xlib and QT don't
clash.
|
|
|
|
|
|
| |
Make archiving various pictures easier. When NewPicsDialog is calles
with a directory, the Next> button archives the current pic and selects
the next.
|
| |
|
|
|
|
| |
Never did anything, and we'll know soon enough.
|
|
|
|
| |
Replace \d files selected with \d/\d files.
|
|
|
|
|
|
|
|
| |
and replace them with write/readSettings. It was a useless feature
anyway, don't even remember what it was good for.
Also fix another bug in MappingTreeResultModel: Clear mCurrentData too,
when clearData is called.
|
|
|
|
|
| |
Also fix a long standing bug in MappingTreeModel: also remove item from
mCurrentData when the removed item is a parent of one of the items.
|
|
|
|
|
| |
Well, everything besides the selected selection... That needs some more
work.
|
|
|
|
| |
Show actual size of selected files.
|
|
|
|
|
| |
Well, sanitize the sliding madness. Replace it by a dialog and just one
timer. Seems to work so far...
|
|
|
|
| |
Well, implement functionality. Seems to work as intended.
|
|
|
|
| |
Does nothing yet, just the dialog...
|
|
|
|
|
|
|
|
|
|
| |
Automatically converting a damaged file to PNG and updating the archive
is fine as long as we're *in* the archive, but it totally messes things
up if we're browsing the file system.
So check if the image is in the archive path, and only then consider
auto-converting it. Also show a notice in the InfoItem if the file has
been converted.
|
|
|
|
|
|
| |
Don't try to access an empty QList<QVariant>. It comes from the
constructor. There has to be a better way to fix this, but right now it
eludes me...
|
|
|
|
|
| |
For now, recent is hardcoded to pictures added in the last 6 months.
Maybe it should be configurable...
|
|
|
|
|
|
| |
* place it bottom right instead of right center
* add proper margins
* use variables for margins and sizes instead of magic numbers
|
|
|
|
| |
Remove action from context menu.
|
|
|
|
| |
Remove actions that are now triggered by the ControlItem.
|
| |
|
|
|
|
| |
Call the appropriate functions on keyPressEvent
|
|
|
|
|
| |
When changing from slide through all to slide, reload picture list from
model instead of continuing with current list from all.
|
|
|
|
|
| |
Now the controls actually do something. Not still as promised, but they
kinda work!
|
|
|
|
|
| |
Draw control items in PictureViewer2 at the right centered on the y-
axis.
|
|
|
|
| |
Draw a dummy rounded rectangle on the bottom left for control items.
|
|
|
|
|
| |
Introduce PictureViewerGraphicsScene for upcoming control items in the
scene.
|
|
|
|
| |
Check if the currently shown picture still exists instead of crashing.
|
|
|
|
|
| |
Wow, that was much more complicated than I first thought, but it seems
to work. Maybe it's much more convoluted than it has to be :)
|
|
|
|
|
|
|
|
| |
Well, seems that's Qt's ImageReader got pickier regarding jpeg-files. If
the resulting QPixmap is null and void, try to convert them to png.
This introduces a new dependency to ImageMagic++. I don't like it, but
it works, kinda... I saw random crashes while testing...
|
|
|
|
|
|
|
|
|
|
| |
* start maximized
* focus MappingTree when showing NewPicsDialog
* Keyboard Shortcuts for FilesystemWidget:
CTRL+UP: go to parent dir
CTRL+LEFT: go back
CTRL+U: unpack
* close UnpackDialog when done
|
|
|
|
|
|
| |
Make it possible to resize the PictureViewer2 and get rid of fixed size.
Also, make sure that the current picture is redrawn when we get a resize
event.
|
|
|
|
|
| |
Add button to save the position of the NewPicsDialog and move it there
when we show()
|
|
|
|
|
|
| |
When calling NewPicsDialog from PictureViewer, move it to the top left
corner to not cover the pic itself. Also, select all pics from current
directory when no files are marked.
|
|
|
|
|
|
|
|
|
|
| |
Resurrect the indented MappingItem. There's some recursion involved, but
actually it ain't so hard if you have a template :)
This adventure uncovered a bug in NewPicsDialog: Right now we also
record the nodes (not just the leaves) for the Mappings. This bug was
introduced by commit dc7cc269a4fffe43bdac2ae2dc6548fbd1e3bb5e and will
be fixed in one of the next commits.
|
|
|
|
|
|
|
| |
Well, I hope this fixes the crashes for good. String comparison for
looking up the parents really wasn't a prudent thing to do...
Use the ParentIds instead.
|
|
|
|
|
| |
MappingTreeModel::treeFromPath() never worked as intended, so replace it
by displaying mappings in a QTextTable.
|
|
|
|
|
| |
PageDown = back 25
PageUp = forward 25
|
| |
|