Conversion to TDE #1

Manually merged
SlavekB merged 1 commits from feat/convert_qt3_tqt3 into master 4 years ago
Ghost commented 4 years ago
There is no content yet.
Ghost added the PR/wip label 4 years ago
Ghost commented 4 years ago
Poster

Rem, amend commit buildidng/building done
FTBFS, add moc includes done
remove scons stuff done

Rem, amend commit buildidng/building done FTBFS, add moc includes done remove scons stuff done
Owner

A few comments:

  1. Please, instead of ntq*.h, let's use tq*.h.
  2. It is good to use common CMake rules for documentation, such as in Abakus.
  3. All SCons stuff is suitable for removal.
  4. Is doc/en/index.cache.bz2 suitable for removal? I assume it's the kind of file we generate during build.
  5. You can probably use tde_create_translated_desktop for desktop files now. If you want to extract translations from desktop files into PO files, you can use the script scripts/conversions/tde-l10n/tde-l10n_split_desktop.
  6. It is good to use common CMake rules for PO files.
  7. Script po/messages.sh is probably suitable for removal. You may notice that script mentions kdissert.pot, so it probably didn't work properly.
A few comments: 1. Please, instead of `ntq*.h`, let's use `tq*.h`. 2. It is good to use common CMake rules for documentation, such as in Abakus. 3. All SCons stuff is suitable for removal. 4. Is `doc/en/index.cache.bz2` suitable for removal? I assume it's the kind of file we generate during build. 5. You can probably use `tde_create_translated_desktop` for desktop files now. If you want to extract translations from desktop files into PO files, you can use the script `scripts/conversions/tde-l10n/tde-l10n_split_desktop`. 6. It is good to use common CMake rules for PO files. 7. Script `po/messages.sh` is probably suitable for removal. You may notice that script mentions `kdissert.pot`, so it probably didn't work properly.
Ghost commented 4 years ago
Poster
  1. Please, instead of ntq*.h, let's use tq*.h.
  2. Is doc/en/index.cache.bz2 suitable for removal? I assume it's the kind of...
    Was planned 😏

About translations, I have to have a look for...😩

There are few thing I'd like to have a closer look as well (help page, symbols visibility, headers tweak, etc), stay tuned! ☺️

> 1. Please, instead of `ntq*.h`, let's use `tq*.h`. > 4. Is `doc/en/index.cache.bz2` suitable for removal? I assume it's the kind of... Was planned :smirk: About translations, I have to have a look for...:weary: There are few thing I'd like to have a closer look as well (help page, symbols visibility, headers tweak, etc), stay tuned! :relaxed:
MicheleC changed title from Conversion qt3 -> tqt3 to Conversion to TDE 4 years ago
Ghost changed title from Conversion to TDE to WIP:Conversion to TDE 4 years ago
Ghost commented 4 years ago
Poster

Rem check:

  • definitions (XTest, xine) Done!
  • help page to update Done!
Rem check: - definitions (XTest, xine) Done! - help page to update Done!
Ghost commented 4 years ago
Poster

Don't make three folders for desktop translations, gather every strings into one po file.

  1. Restore desktop files to include translations:
  2. Run the script to process all desktop files:
    tde-l10n_spl_desktop -o codeine-desktops/ misc/*.desktop

In this way, the script creates one common POT template for all desktop files and extracts the existing translations into one set of PO files.
..located in translations/desktop_files/codeine-desktops

Don't make three folders for desktop translations, gather every strings into one po file. 1. Restore desktop files to include translations: 2. Run the script to process all desktop files: tde-l10n_spl_desktop -o codeine-desktops/ misc/*.desktop In this way, the script creates one common POT template for all desktop files and extracts the existing translations into one set of PO files. ..located in translations/desktop_files/codeine-desktops
Ghost commented 4 years ago
Poster

Big Buck Bunny videos for testing purpose:

http://distribution.bbb3d.renderfarming.net/video/mp4/

codeine http://distribution.bbb3d.renderfarming.net/video/mp4/big_buck_bunny_720p_surround.avi &
Big Buck Bunny videos for testing purpose: http://distribution.bbb3d.renderfarming.net/video/mp4/ ``` codeine http://distribution.bbb3d.renderfarming.net/video/mp4/big_buck_bunny_720p_surround.avi & ```
Ghost commented 4 years ago
Poster

@SlavekB, you don't mind adding the desktop translation stuff, do you? 😇

@SlavekB, you don't mind adding the desktop translation stuff, do you? :innocent:
Ghost commented 4 years ago
Poster

please give It a test:

two things are bothering me, namely:

  • ...play/pause does not have an icon, did the original Codeine had any? The png image in the doc suggests so..
  • the file "codeinerc" probably have to go to the system config (either in /etc or /etc/codeine).
please give It a test: two things are bothering me, namely: - ...play/pause does not have an icon, did the original Codeine had any? The png image in the doc suggests so.. - the file "codeinerc" probably have to go to the system config (either in /etc or /etc/codeine).
Ghost added PR/rfc and removed PR/wip labels 4 years ago
Ghost commented 4 years ago
Poster

@MicheleC when you get time for, can you please have a look on this?

Here is the error I get with xinelib-1.2.10:

Building CXX object src/app/CMakeFiles/codeine.dir/xineEngine.cpp.o
/home/cethyel/CMAKE_CONVERSION/codeine/src/app/xineEngine.cpp: In member function ‘const Scope& Codeine::VideoWindow::scope()’:
/home/cethyel/CMAKE_CONVERSION/codeine/src/app/xineEngine.cpp:593:27: error: ‘metronom_t’ {aka ‘struct metronom_s’} has no member named ‘pts_per_smpls’
  593 |       diff /= myMetronom->pts_per_smpls;
      |                           ^~~~~~~~~~~~~
/home/cethyel/CMAKE_CONVERSION/codeine/src/app/xineEngine.cpp: In static member function ‘static void Codeine::VideoWindow::xineEventListener(void*, const xine_event_t*)’:
/home/cethyel/CMAKE_CONVERSION/codeine/src/app/xineEngine.cpp:725:70: warning: ‘xine_mrl_reference_data_t’ is deprecated [-Wdeprecated-declarations]
  725 |       engine->m_url = TQString::fromUtf8( ((xine_mrl_reference_data_t*)xineEvent->data)->mrl );
      |                                                                      ^
In file included from /home/cethyel/CMAKE_CONVERSION/codeine/src/app/xineEngine.cpp:18:
/usr/include/xine.h:2062:3: note: declared here
 2062 | } xine_mrl_reference_data_t XINE_DEPRECATED;
      |   ^~~~~~~~~~~~~~~~~~~~~~~~~
gmake[2]: *** [src/app/CMakeFiles/codeine.dir/build.make:108: src/app/CMakeFiles/codeine.dir/xineEngine.cpp.o] Error 1
gmake[1]: *** [CMakeFiles/Makefile2:273: src/app/CMakeFiles/codeine.dir/all] Error 2
gmake: *** [Makefile:150: all] Error 2
@MicheleC when you get time for, can you please have a look on this? Here is the error I get with xinelib-1.2.10: ``` Building CXX object src/app/CMakeFiles/codeine.dir/xineEngine.cpp.o /home/cethyel/CMAKE_CONVERSION/codeine/src/app/xineEngine.cpp: In member function ‘const Scope& Codeine::VideoWindow::scope()’: /home/cethyel/CMAKE_CONVERSION/codeine/src/app/xineEngine.cpp:593:27: error: ‘metronom_t’ {aka ‘struct metronom_s’} has no member named ‘pts_per_smpls’ 593 | diff /= myMetronom->pts_per_smpls; | ^~~~~~~~~~~~~ /home/cethyel/CMAKE_CONVERSION/codeine/src/app/xineEngine.cpp: In static member function ‘static void Codeine::VideoWindow::xineEventListener(void*, const xine_event_t*)’: /home/cethyel/CMAKE_CONVERSION/codeine/src/app/xineEngine.cpp:725:70: warning: ‘xine_mrl_reference_data_t’ is deprecated [-Wdeprecated-declarations] 725 | engine->m_url = TQString::fromUtf8( ((xine_mrl_reference_data_t*)xineEvent->data)->mrl ); | ^ In file included from /home/cethyel/CMAKE_CONVERSION/codeine/src/app/xineEngine.cpp:18: /usr/include/xine.h:2062:3: note: declared here 2062 | } xine_mrl_reference_data_t XINE_DEPRECATED; | ^~~~~~~~~~~~~~~~~~~~~~~~~ gmake[2]: *** [src/app/CMakeFiles/codeine.dir/build.make:108: src/app/CMakeFiles/codeine.dir/xineEngine.cpp.o] Error 1 gmake[1]: *** [CMakeFiles/Makefile2:273: src/app/CMakeFiles/codeine.dir/all] Error 2 gmake: *** [Makefile:150: all] Error 2 ```
Owner

Hi Greg, I am currently looking at similar issues on amarok with xine 1.2.10. Once I am donw with that, I will take a look here as well. The problem is related to the same structure changes introduced in xine 1.2.10.

Hi Greg, I am currently looking at similar issues on amarok with xine 1.2.10. Once I am donw with that, I will take a look here as well. The problem is related to the same structure changes introduced in xine 1.2.10.
Ghost commented 4 years ago
Poster

Rem: https://mirror.git.trinitydesktop.org/gitea/TDE/codeine/src/branch/master/src/part/videoWindow.h#L49

xine_event_t must have been in xine for quite some time since It's in xine-1.1.21 source

Rem: https://mirror.git.trinitydesktop.org/gitea/TDE/codeine/src/branch/master/src/part/videoWindow.h#L49 **xine_event_t** must have been in xine for quite some time since It's in xine-1.1.21 source
Owner

I have added a fix for the scope when using xine 1.2.10, similar to what done in Amarok.

Codeine builds and works fine in Debian, but there is still some work to do. For example when choosing "PLay file", the filter options are wrong and no file can be selected. Anyhow right clicking on a file in Konqueror and opening with Codeine works and the file plays correctly.

I have added a fix for the scope when using xine 1.2.10, similar to what done in Amarok.<br/> Codeine builds and works fine in Debian, but there is still some work to do. For example when choosing "PLay file", the filter options are wrong and no file can be selected. Anyhow right clicking on a file in Konqueror and opening with Codeine works and the file plays correctly.
Owner

Debian support available in PR TDE/tde-packaging#65.

Debian support available in PR TDE/tde-packaging#65.
Ghost commented 4 years ago
Poster

...but there is still some work to do. For example when choosing "PLay file", the filter options are wrong and no file can be selected. Anyhow right clicking on a file in Konqueror and opening with Codeine works and the file plays correctly.

Yes, clicking on that button does not work, the files extensions are not recognized.

Your patch have fixed FTBFS 👍

> ...but there is still some work to do. For example when choosing "PLay file", the filter options are wrong and no file can be selected. Anyhow right clicking on a file in Konqueror and opening with Codeine works and the file plays correctly. Yes, clicking on that button does not work, the files extensions are not recognized. Your patch have fixed FTBFS :+1:
Owner

I happened to test in Kaffeine and I see the same problem with unknown file format. I wonder if the problem is related to the xine engine perhaps. More investigation will definitely be needed.

I happened to test in Kaffeine and I see the same problem with unknown file format. I wonder if the problem is related to the xine engine perhaps. More investigation will definitely be needed.
Owner

Regarding codeinerc I assume it doesn't need to be installed. This seems to be some basis of user configuration, and if it is not present, the default values will be used.

Regarding `codeinerc` I assume it doesn't need to be installed. This seems to be some basis of user configuration, and if it is not present, the default values will be used.
Ghost commented 4 years ago
Poster

Codeine with KDE3 on an OpenSuse (15.0) machine does have a Play/Pause icon but the files extensions aren't recognized as well (test with avi and mp4 file), this might be a Codeine bug.

Codeine with KDE3 on an OpenSuse (15.0) machine does have a Play/Pause icon but the files extensions aren't recognized as well (test with avi and mp4 file), this might be a Codeine bug.
Ghost commented 4 years ago
Poster

At the moment the play/pause icon is missing, by default codeinerc is filled with these parameters:

[KFileDialog Settings]
ShowPreviews=false

[MainWindow Toolbar dvdToolBar]
Hidden=true
IconText=IconTextRight
Index=0

[MainWindow Toolbar mainToolBar]
Index=1

but when i add these:

[KFileDialog Settings]
ShowPreviews=false

[MainWindow Toolbar dvdToolBar]
Hidden=true
IconText=IconTextRight
Index=0

[MainWindow Toolbar mainToolBar]
Index=1
IconSize=22

[codeine-mainwindow#1 Toolbar style]
IconSize=22

The icon is back. 😃
But the full screen view has been changed with the same icon 😕

At the moment the play/pause icon is missing, by default codeinerc is filled with these parameters: ``` [KFileDialog Settings] ShowPreviews=false [MainWindow Toolbar dvdToolBar] Hidden=true IconText=IconTextRight Index=0 [MainWindow Toolbar mainToolBar] Index=1 ``` but when i add these: ``` [KFileDialog Settings] ShowPreviews=false [MainWindow Toolbar dvdToolBar] Hidden=true IconText=IconTextRight Index=0 [MainWindow Toolbar mainToolBar] Index=1 IconSize=22 [codeine-mainwindow#1 Toolbar style] IconSize=22 ``` The icon is back. :smiley: But the full screen view has been changed with the same icon :confused:
Owner

I see the play/pause button in debian, in a location similar to your screenshot, Greg.

As for the extension, we need to investigate if perhaps it is a problem related to xine or some common libraries, since I see the same issue in kaffeine too.

I see the play/pause button in debian, in a location similar to your screenshot, Greg. As for the extension, we need to investigate if perhaps it is a problem related to xine or some common libraries, since I see the same issue in kaffeine too.
Owner

Codeine running in Lenny + KDE 3.5.10

Codeine running in Lenny + KDE 3.5.10
Owner

Hi Greg, I tested the latest commits as you asked, everything seems in order. Still the problem with the supported extension remains.

Hi Greg, I tested the latest commits as you asked, everything seems in order. Still the problem with the supported extension remains.
Ghost commented 4 years ago
Poster

Several icons are missing, look at screenshot Screenshot_2020-07-02_12-50-58.png for instance, but after many tries and testings, I couldn't bring them back.
From the KDE3 era as a reference, tdelibs/pics some icons have been renamed, some are spreaded or added in other modules. 😕

If you feel like adding Codeine, be my guess. 😔

The file extension Pb remains but it seems the bug was in Codeine/kde3 as well.

Several icons are missing, look at screenshot **Screenshot_2020-07-02_12-50-58.png** for instance, but after many tries and testings, I couldn't bring them back. From the KDE3 era as a reference, tdelibs/pics some icons have been renamed, some are spreaded or added in other modules. :confused: If you feel like adding Codeine, be my guess. :pensive: The file extension Pb remains but it seems the bug was in Codeine/kde3 as well.
SlavekB changed title from WIP:Conversion to TDE to Conversion to TDE 4 years ago
Owner

Everything we wanted to do before being included as part of TDE seems to have been done. So it's time to move forward and invite the application to TDE.

Everything we wanted to do before being included as part of TDE seems to have been done. So it's time to move forward and invite the application to TDE.
SlavekB closed this pull request 4 years ago
SlavekB removed the PR/rfc label 4 years ago
SlavekB deleted branch feat/convert_qt3_tqt3 4 years ago
Owner

Finally merged 👍

Finally merged :+1:
MicheleC added this to the R14.0.9 release milestone 4 years ago
The pull request has been manually merged as b555091a39.
Sign in to join this conversation.
No reviewers
No Milestone
No Assignees
3 Participants
Notifications
Due Date

No due date set.

Dependencies

No dependencies set.

Reference: TDE/codeine#1
Loading…
There is no content yet.