- Queries
- All Stories
- Search
- Advanced Search
Feed Advanced Search
Advanced Search
Advanced Search
Apr 4 2020
Apr 4 2020
mreeves committed R983:372fc82bbb1d: Rework MergeResultWindow::slotUpdateAvailabilities (authored by mreeves).
Rework MergeResultWindow::slotUpdateAvailabilities
Sort hearders
mreeves committed R983:7c7adfad1cde: Support old style MacOS line endings in MergeResultWindow::pasteClipboard (authored by mreeves).
Support old style MacOS line endings in MergeResultWindow::pasteClipboard
Move selectAll handling out of main app
Use TYPE_MAX instead of INT_MAX
Fix formatting
mreeves committed R983:9b96af15f0cc: Let MergeResultsWindow handle its response to cut. (authored by mreeves).
Let MergeResultsWindow handle its response to cut.
mreeves committed R983:7a01d8f41b18: Add refresh slot and setupConnections to DirectoryMergeWindow (authored by mreeves).
Add refresh slot and setupConnections to DirectoryMergeWindow
mreeves committed R983:fa871d0ec8bf: Drop KDiff3App::setDiff3Line and connect QScrollBar::setValue directly (authored by mreeves).
Drop KDiff3App::setDiff3Line and connect QScrollBar::setValue directly
mreeves committed R983:86fca87eba13: Drop unused parameter to DiffTextWindowData::prepareTextLayout (authored by mreeves).
Drop unused parameter to DiffTextWindowData::prepareTextLayout
mreeves committed R983:447dea479d56: Let MergeResultWindow handle its own resize (authored by mreeves).
Let MergeResultWindow handle its own resize
Check m_pOverview as well
Drop unused variable
Update Change Log.
Mar 29 2020
Mar 29 2020
Update Change Log.
Mar 27 2020
Mar 27 2020
mreeves committed R983:58a4151f456c: Only flag line as modifed if no source is selected. (authored by mreeves).
Only flag line as modifed if no source is selected.
Fix adding a blank line.
Drop attempt to optimize drawing
mreeves committed R983:24d18b28922c: Only flag line as modifed if no source is selected. (authored by mreeves).
Only flag line as modifed if no source is selected.
Allow editting removed lines.
Fix formatting
Fix adding blank line.
Drop attempt to optimize drawing
mreeves committed R983:049c7bf0cdad: Let's use that status message slot everywhere (authored by mreeves).
Let's use that status message slot everywhere
Add vertical scroll signals
Mar 22 2020
Mar 22 2020
mreeves committed R983:2fd131bef4e9: Drop remaining manual wheel event logic. (authored by mreeves).
Drop remaining manual wheel event logic.
mreeves committed R983:ffe90d41e897: Let DiffTextWindow Handle its own wheel events (authored by mreeves).
Let DiffTextWindow Handle its own wheel events
Move vScroll into diffTextWindow
Leverage QScroll's keyEvent handling.
mreeves committed R983:2e8736f4c419: Let Overview::setFirstLine handle setRange. (authored by mreeves).
Let Overview::setFirstLine handle setRange.
Drop custom scrollWheel logic
mreeves committed R983:b5c3aadb2d18: Drop commented line (No that isn't used.) (authored by mreeves).
Drop commented line (No that isn't used.)
mreeves committed R983:d4379923f14d: Remove remaining direct comparisions of lineRef to -1 (authored by mreeves).
Remove remaining direct comparisions of lineRef to -1
Make e_MergeDetails a scoped enum
Mar 13 2020
Mar 13 2020
Fix missing line numbers.
Insure page range is allways valid.
Fix missing line numbers.
Mar 10 2020
Mar 10 2020
Fix clazy warning
mreeves committed R983:11e93232ed49: Support "Print Current Page" through option not a magic number (authored by mreeves).
Support "Print Current Page" through option not a magic number
Port away from addEnabledOption
mreeves committed R983:a8313938e600: Support "Print Current Page" through option not a magic number (authored by mreeves).
Support "Print Current Page" through option not a magic number
mreeves committed R983:38af078b1b3b: Use QSharedPointer::data instead of weird syntax trick (authored by mreeves).
Use QSharedPointer::data instead of weird syntax trick
Drop random undef
Rename member variable
mreeves committed R983:e59dc732a63c: Use default initialization for MergeReultWindow (authored by mreeves).
Use default initialization for MergeReultWindow
Use QPointer with QAction pointers
Fix formatting
Mar 6 2020
Mar 6 2020
mreeves committed R983:338339018e13: Do not use AUTOUIC, but ki18n_wrap_ui, as needed to integrate with ki18n (authored by kossebau).
Do not use AUTOUIC, but ki18n_wrap_ui, as needed to integrate with ki18n
mreeves committed R983:14953d848149: Do not set CMAKE_AUTOMOC ourselves, done by KDECMakeSettings (authored by kossebau).
Do not set CMAKE_AUTOMOC ourselves, done by KDECMakeSettings
mreeves committed R983:aab6c3563c53: Keep m_bDirCompare in-sync when completeInit is called with non-empty path (authored by mreeves).
Keep m_bDirCompare in-sync when completeInit is called with non-empty path
mreeves committed R983:bc0ea00e4330: Make e_OverviewMode scoped enum and non-nested (authored by mreeves).
Make e_OverviewMode scoped enum and non-nested
Fix KF_DEPRECATED_WARNINGS_SINCE flag
Expose isDir function in SourceData.
Use m_widget not m_part->widget
mreeves committed R983:7424bb285a89: Keep m_bDirCompare in-sync when completeInit is called with non-empty path (authored by mreeves).
Keep m_bDirCompare in-sync when completeInit is called with non-empty path
mreeves committed R983:57dd46222e01: Don't call completeInit inside KDiff3App constructor. (authored by mreeves).
Don't call completeInit inside KDiff3App constructor.
mreeves committed R983:e200ba0970c8: Rework slotWinFocusNext/slotWinFocusPrev (authored by mreeves).
Rework slotWinFocusNext/slotWinFocusPrev
mreeves committed R983:a4153436e8f9: Use Qt signal/slot to trigger overview mode change (authored by mreeves).
Use Qt signal/slot to trigger overview mode change
mreeves committed R983:09c6d38178c4: Connect existing redraw slot to showWhiteSpaceToggled (authored by mreeves).
Connect existing redraw slot to showWhiteSpaceToggled
Add accessors for word wrap pref
Mar 5 2020
Mar 5 2020
Word of warning 'arch land' will not work for this project as it is on gitlab see D26064 for instructions.
Feb 26 2020
Feb 26 2020
Drop redudant nullptr check
Add --noauto option
mreeves committed R983:6d9b336aa026: Fix incorect parameter order for connect (authored by mreeves).
Fix incorect parameter order for connect
Add getOptions accessor
mreeves committed R983:eabe9a391f40: Make DiffFrameTextWindow::setFirstLine a slot (authored by mreeves).
Make DiffFrameTextWindow::setFirstLine a slot
Refactor setHorizScrollOffset
Feb 20 2020
Feb 20 2020
mreeves committed R983:354fbe69d001: Don't cut off text at view port boundary (authored by mreeves).
Don't cut off text at view port boundary
mreeves committed R983:cf6aa4c88615: Don't cut off text at view port boundary (authored by mreeves).
Don't cut off text at view port boundary
rm extra space
Feb 16 2020
Feb 16 2020
Fix string regression
mreeves committed R983:2034034fc7eb: Disable ci's not yet supported by invent.kde.org (authored by mreeves).
Disable ci's not yet supported by invent.kde.org
Feb 15 2020
Feb 15 2020
Sync master with branch 1.8
Feb 14 2020
Feb 14 2020
mreeves committed R983:0da64bc3d358: Merge branch 'fix-QfileDialog-filter' into '1.8' (authored by mreeves).
Merge branch 'fix-QfileDialog-filter' into '1.8'
mreeves committed R983:ee0ba78dd3b8: Set base image for test explictly install libqt5test5 (authored by mreeves).
Set base image for test explictly install libqt5test5
mreeves added a reverting change for R983:a9c97363930d: do complete Qt dev setup for test: R983:1bb161bd00bb: Revert "do complete Qt dev setup for test".
mreeves committed R983:1bb161bd00bb: Revert "do complete Qt dev setup for test" (authored by mreeves).
Revert "do complete Qt dev setup for test"
do complete Qt dev setup for test
FIx CI Config for test.
Add KDE standard CI
Feb 10 2020
Feb 10 2020
Check parent in distructor
Add support for Info.plist
mreeves committed R983:417ed6047ada: Drop unneeded destructor/constructor for SourceData (authored by mreeves).
Drop unneeded destructor/constructor for SourceData
mreeves committed R983:5325f1e230d8: Don't attempt to free nullptr in SourceData::FileData::reset() (authored by mreeves).
Don't attempt to free nullptr in SourceData::FileData::reset()
Add support for Info.plist
mreeves committed R983:64804a649bd0: Don't attempt to free nullptr in SourceData::FileData::reset() (authored by mreeves).
Don't attempt to free nullptr in SourceData::FileData::reset()
Feb 8 2020
Feb 8 2020
mreeves committed R983:57365911d3ae: Redraw while scrolling in DiffTextWindow (authored by mreeves).
Redraw while scrolling in DiffTextWindow
mreeves committed R983:578d3901f6db: Redraw while scrolling in DiffTextWindow (authored by mreeves).
Redraw while scrolling in DiffTextWindow
mreeves committed R983:68acd7a55529: make e_SrcSelector scoped enum guard all casts from int (authored by mreeves).
make e_SrcSelector scoped enum guard all casts from int
Explicitly set automoc and autouic
Feb 7 2020
Feb 7 2020
mreeves committed R983:685a278c32a4: Fix unintialized variable in FileAccess construction. (authored by mreeves).
Fix unintialized variable in FileAccess construction.
mreeves committed R983:f4c66aceab91: Use QScrollArea instead of QFrame as base for OptionDialog pages. (authored by mreeves).
Use QScrollArea instead of QFrame as base for OptionDialog pages.
mreeves committed R983:732d76fd5c15: Use separate label for the 'Merge' settings page to distinguish it from button… (authored by yurchor).
Use separate label for the 'Merge' settings page to distinguish it from button…
mreeves committed R983:c7eaafa2f796: Don't clober firstNonhite if line contains multiple white space sequences (authored by mreeves).
Don't clober firstNonhite if line contains multiple white space sequences